Merge remote-tracking branch 'origin/master'

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsOldInventoryRest.java

@@ -50,6 +50,12 @@ public class WmsOldInventoryRest {
         return wmsOldInventoryService.saveInventory(dto);
     }
 
+    @ApiOperation("竣工推送待入库旧件")
+    @PostMapping("/pushOldStayInvent")
+    ResultBean pushOldStayInvent(@RequestBody WmsOldInventoryPush push) {
+        return wmsOldInventoryService.pushOldStayInvent(push);
+    }
+
     @ApiOperation("旧件库存查询")
     @PostMapping("/oldPageList")
     ResultBean<PagerVo<WmsOldInventoryPageListVo>> oldPageList(@RequestBody PagerQuery<WmsOldInventoryPageListQuery> pagerQuery) {

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryPush.java

@@ -0,0 +1,49 @@
+package com.yxt.wms.biz.inventory.wmsoldinventory;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/28
+ **/
+@Data
+public class WmsOldInventoryPush {
+
+    private String sid;
+    private String remarks;
+    private String createBySid;
+    //商品ID
+    private String goodsID;
+    //商品Sku名称
+    private String goodsSkuTitle;
+    //商品编码（图号）
+    private String goodsSkuCode;
+    //厂家
+    private String manufacturerName;
+    //规格型号
+    private String goodsSkuOwnSpec;
+    //计量单位
+    private String unit;
+    //数量
+    private String count;
+    //已入库数量
+    private String inCount;
+    //维修工单编号
+    private String billNo;
+    //客户名称
+    private String customerName;
+    // 车牌号
+    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

@@ -3,6 +3,7 @@ package com.yxt.wms.biz.inventory.wmsoldinventory;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
@@ -32,6 +33,8 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
     private WmsInventoryService wmsInventoryService;
     @Autowired
     private WmsInventoryRecordService wmsInventoryRecordService;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
 
     public PagerVo<WmsOldInventoryVo> listPage(PagerQuery<WmsOldInventoryQuery> pagerQuery) {
         WmsOldInventoryQuery query = pagerQuery.getParams();
@@ -261,4 +264,17 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
         list.removeAll(Collections.singleton(null));
         return list;
     }
+
+    public ResultBean pushOldStayInvent(WmsOldInventoryPush push) {
+        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();
+    }
 }