旧件相关对接调整开发

销售出库推送销售台账失败问题测试修改

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 fba.`nodeState` != '终止'
-  AND fi.billingState != '作废'
+          AND fi.billingState != '作废'
     </select>
 
     <select id="checkIsKp" resultType="int">

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairPageVo.java

@@ -15,6 +15,8 @@ public class AsBusrepairPageVo {
 
     private String sid;
 
+    //维修工单sid
+    private String billSid;
     //维修工单编号
     private String billNo;
     //工单创建日期

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml

@@ -68,6 +68,7 @@
 
     <select id="pageBillList" resultType="com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairPageVo">
         select b.sid,
+               a.sid as billSid,
                a.billNo,
                a.billType,
                DATE_FORMAT(a.createTime, '%Y-%m-%d') as billTime,

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -729,13 +729,15 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         IPage<AsBusrepairPageVo> pagging = baseMapper.pageBillList(page, qw);
         for (AsBusrepairPageVo record : pagging.getRecords()) {
             String photoss = record.getPhotoss();
-            String[] files = photoss.split(",");
+            if (StringUtils.isNotBlank(photoss)){
-            List<String> photos = new ArrayList<>();
+                String[] files = photoss.split(",");
-            for (String file : files) {
+                List<String> photos = new ArrayList<>();
-                String url = fileUploadComponent.getUrlPrefix() + file;
+                for (String file : files) {
-                photos.add(url);
+                    String url = fileUploadComponent.getUrlPrefix() + file;
+                    photos.add(url);
+                }
+                record.setPhotos(photos);
             }
-            record.setPhotos(photos);
         }
         PagerVo<AsBusrepairPageVo> p = PagerUtil.pageToVo(pagging, null);
         return p;

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获取一条记录")

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<SmsGoodsMapper, SmsGoods> {
-
+    
-
     public SmsGoods fetchEntityByGoodsID(String goodsID) {
         return baseMapper.fetchEntityByGoodsID(goodsID);
     }

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
         <where>
             ${ew.sqlSegment}
         </where>

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<WmsInventoryRe
 
     @Autowired
     private WmsInventoryService wmsInventoryService;
+    @Autowired
+    private SysUserFeign sysUserFeign;
 
     private QueryWrapper<WmsInventoryRecord> createQueryWrapper(WmsInventoryRecordQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -268,6 +272,10 @@ public class WmsInventoryRecordService extends MybatisBaseService<WmsInventoryRe
                 );
         IPage<WmsInventoryRecord> page = PagerUtil.queryToPage(pagerQuery);
         IPage<WmsInventoryRecordsVo> pagging = baseMapper.listPage(page, qw);
+        for (WmsInventoryRecordsVo record : pagging.getRecords()) {
+            SysUserVo sysUserVo = sysUserFeign.fetchBySid(record.getCreateBySid()).getData();
+            record.setCreateByName(sysUserVo.getName());
+        }
         PagerVo<WmsInventoryRecordsVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }

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;
 }

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;
 }

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,
+               wor.shortss,
-               woi.photos
+               wor.photos
         from wms_old_inventory woi
+        left join wms_old_register wor
+        on woi.billNo = wor.billNo
         <where>
             ${ew.sqlSegment}
         </where>
     </select>
 
     <select id="selectInit" resultType="com.yxt.wms.biz.inventory.wmsoldinventory.WmsOldInventoryInitVo">
-        select woi.sourceBillNo,
+        select woi.sid,
+               woi.billNo as sourceBillNo,
                woi.vinNo,
-               woi.goodSpuSid,
+               woi.vehMark,
-               woi.goodsSpuName,
-               woi.goodsSkuSid,
                woi.goodsSkuTitle,
                woi.goodsSkuCode,
                woi.manufacturerName,
                woi.goodsSkuOwnSpec,
                woi.unit,
-               woi.notInCount,
+               woi.count
-               woi.warehouseSid,
-               woi.warehouseName,
-               woi.warehouseRackSid,
-               woi.warehouseRackCode,
-               woi.count,
-               woi.sid
         from wms_old_inventory woi
         where woi.sid = #{sid}
     </select>

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<String> photoList = new ArrayList<>();
-
 }

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<WmsOldInventoryMa
         }
         //商品名称
         if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
-            qw.like("woi.goodsSpuName", query.getGoodsSpuName());
+            qw.like("woi.goodsSkuTitle", query.getGoodsSpuName());
         }
         //商品编码
         if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
@@ -58,6 +59,18 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
         qw.eq("woi.state", 1);
         IPage<WmsOldInventory> page = PagerUtil.queryToPage(pagerQuery);
         IPage<WmsOldInventoryVo> pagging = baseMapper.listPage(page, qw);
+        for (WmsOldInventoryVo record : pagging.getRecords()) {
+            String photoss = record.getPhotos();
+            if (StringUtils.isNotBlank(photoss)){
+                String[] files = photoss.split(",");
+                List<String> photos = new ArrayList<>();
+                for (String file : files) {
+                    String url = fileUploadComponent.getUrlPrefix() + file;
+                    photos.add(url);
+                }
+                record.setPhotosList(photos);
+            }
+        }
         PagerVo<WmsOldInventoryVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -269,11 +282,6 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
         ResultBean rb = ResultBean.fireFail();
         WmsOldInventory wmsOldInventory = new WmsOldInventory();
         BeanUtil.copyProperties(push, wmsOldInventory, "sid", "id");
-        List<String> photoList = push.getPhotoList();
-        if (!photoList.isEmpty()) {
-            String files = String.join(",", photoList).replaceAll(fileUploadComponent.getUrlPrefix(), "");
-            wmsOldInventory.setPhotos(files);
-        }
         save(wmsOldInventory);
         return rb.success();
     }