diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.xml index 2ec7be8572..d06c34d96a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.xml @@ -44,11 +44,11 @@ LEFT JOIN fin_bill_application fba ON fbv.`billAppSid` = fba.`sid` LEFT JOIN fin_vehicle_invoice fi - ON fba.`contractNo` = fi.`contractNo` + ON fbv.vehSid = fi.vehicleSid WHERE fbv.vehSid = #{vehSid} AND fba.`nodeState` != '待提交' - AND fba.`nodeState` != '终止' - AND fi.billingState != '作废' + AND fba.`nodeState` != '终止' + AND fi.billingState != '作废' select b.sid, + a.sid as billSid, a.billNo, a.billType, DATE_FORMAT(a.createTime, '%Y-%m-%d') as billTime, diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java index 90cec8a2f3..5b7de352a9 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java @@ -729,13 +729,15 @@ public class AsBusrepairBillService extends MybatisBaseService pagging = baseMapper.pageBillList(page, qw); for (AsBusrepairPageVo record : pagging.getRecords()) { String photoss = record.getPhotoss(); - String[] files = photoss.split(","); - List photos = new ArrayList<>(); - for (String file : files) { - String url = fileUploadComponent.getUrlPrefix() + file; - photos.add(url); + if (StringUtils.isNotBlank(photoss)){ + String[] files = photoss.split(","); + List photos = new ArrayList<>(); + for (String file : files) { + String url = fileUploadComponent.getUrlPrefix() + file; + photos.add(url); + } + record.setPhotos(photos); } - record.setPhotos(photos); } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsGoodsRest.java b/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsGoodsRest.java index 424d9e58d9..78a5e56c94 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsGoodsRest.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsGoodsRest.java @@ -5,6 +5,7 @@ import com.yxt.sms.biz.smsgoods.SmsGoods; import com.yxt.sms.biz.smsgoods.SmsGoodsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; /** @@ -16,6 +17,8 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/apiadmin/v1/smsGoods") public class SmsGoodsRest { + + @Autowired private SmsGoodsService smsGoodsService; @ApiOperation("根据goodsID获取一条记录") diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsService.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsService.java index 995ba8b218..1727caa19f 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsService.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smsgoods/SmsGoodsService.java @@ -38,8 +38,7 @@ import org.springframework.stereotype.Service; @Service public class SmsGoodsService extends MybatisBaseService { - - + public SmsGoods fetchEntityByGoodsID(String goodsID) { return baseMapper.fetchEntityByGoodsID(goodsID); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml index 1966711242..9d8f682bc1 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml @@ -94,16 +94,24 @@ wir.goodsSkuCode, wir.goodsSkuOwnSpec, wir.warehouseName, + wwa.areaName as warehouseAreaName, wir.warehouseRackCode, wir.billNo, + wir.billType, DATE_FORMAT(wir.createTime, '%Y-%m-%d') as createTime, wir.busTypeValue, wir.batchNumber, wir.billObjName, wir.currentCount, wir.count, - wir.unit + wir.unit, + wir.handlerName, + wir.createBySid from wms_inventory_record wir + left join wms_warehouse_rack wwr + on wir.warehouseRackSid = wwr.sid + left join wms_warehouse_area wwa + on wwr.locationSid = wwa.sid ${ew.sqlSegment} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java index 5b13bc9a6c..45e3dc1717 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java @@ -32,6 +32,8 @@ import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService; import com.yxt.wms.biz.inventory.wmsinventoryrecord.report.*; import com.yxt.wms.biz.inventory.wmsoldinventory.WmsOldInventoryDetailsListVo; +import com.yxt.wms.feign.portal.sysuser.SysUserFeign; +import com.yxt.wms.feign.portal.sysuser.SysUserVo; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -69,6 +71,8 @@ public class WmsInventoryRecordService extends MybatisBaseService createQueryWrapper(WmsInventoryRecordQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -268,6 +272,10 @@ public class WmsInventoryRecordService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); IPage pagging = baseMapper.listPage(page, qw); + for (WmsInventoryRecordsVo record : pagging.getRecords()) { + SysUserVo sysUserVo = sysUserFeign.fetchBySid(record.getCreateBySid()).getData(); + record.setCreateByName(sysUserVo.getName()); + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsVo.java index 640b872590..7552822063 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordsVo.java @@ -23,6 +23,8 @@ public class WmsInventoryRecordsVo { private String goodsSkuOwnSpec; @ApiModelProperty("仓库名称") private String warehouseName; + @ApiModelProperty("库区名称") + private String warehouseAreaName; @ApiModelProperty("库位编号") private String warehouseRackCode; @ApiModelProperty("来源单据编号") @@ -42,5 +44,9 @@ public class WmsInventoryRecordsVo { private String count; @ApiModelProperty("计量单位") private String unit; - + @ApiModelProperty("操作人") + private String createBySid; + private String createByName; + @ApiModelProperty("经办人") + private String handlerName; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventory.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventory.java index 780f8558b0..2f11392507 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventory.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventory.java @@ -49,10 +49,4 @@ public class WmsOldInventory extends BaseEntity { //车架号 private String vinNo; - - //旧件回收说明 - private String shortss; - - //旧件照片 - private String photos; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryMapper.xml index 765e2b19b4..26289d264c 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryMapper.xml @@ -15,32 +15,27 @@ woi.customerName, woi.vehMark, woi.vinNo, - woi.shortss, - woi.photos + wor.shortss, + wor.photos from wms_old_inventory woi + left join wms_old_register wor + on woi.billNo = wor.billNo ${ew.sqlSegment} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryPush.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryPush.java index bf446a819f..6368e92480 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryPush.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryPush.java @@ -41,9 +41,4 @@ public class WmsOldInventoryPush { private String vehMark; //车架号 private String vinNo; - //旧件回收说明 - private String shortss; - //旧件照片 - private List photoList = new ArrayList<>(); - } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java index 35180289b1..1610b14cf9 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java @@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -45,7 +46,7 @@ public class WmsOldInventoryService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); IPage pagging = baseMapper.listPage(page, qw); + for (WmsOldInventoryVo record : pagging.getRecords()) { + String photoss = record.getPhotos(); + if (StringUtils.isNotBlank(photoss)){ + String[] files = photoss.split(","); + List photos = new ArrayList<>(); + for (String file : files) { + String url = fileUploadComponent.getUrlPrefix() + file; + photos.add(url); + } + record.setPhotosList(photos); + } + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -269,11 +282,6 @@ public class WmsOldInventoryService extends MybatisBaseService photoList = push.getPhotoList(); - if (!photoList.isEmpty()) { - String files = String.join(",", photoList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); - wmsOldInventory.setPhotos(files); - } save(wmsOldInventory); return rb.success(); }