更改

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

@@ -148,7 +148,9 @@ public class WmsInitialRest {
                     int num = new BigDecimal(wmsInitialExcelInfo.getNum()).intValue();
                     for (int i = 0; i < num; i++) {
                         WmsInitialDetail wmsInitialDetail = new WmsInitialDetail();
+                        wmsInitialDetail.setCreateBySid(userSid);
                         wmsInitialDetail.setBillSid(wmsInitial.getSid());
+                        wmsInitialDetail.setGoodsID(getGoodsId(wmsInitialExcelInfo.getGoodsSkuSid()));
                         wmsInitialDetail.setGoodsSpuSid(wmsInitialExcelInfo.getGoodsSpuSid());
                         wmsInitialDetail.setGoodsSpuName(wmsInitialExcelInfo.getGoodsSpuName());
                         wmsInitialDetail.setGoodsSkuSid(wmsInitialExcelInfo.getGoodsSkuSid());
@@ -181,7 +183,9 @@ public class WmsInitialRest {
                     }
                 } else {
                     WmsInitialDetail wmsInitialDetail = new WmsInitialDetail();
+                    wmsInitialDetail.setCreateBySid(userSid);
                     wmsInitialDetail.setBillSid(wmsInitial.getSid());
+                    wmsInitialDetail.setGoodsID(getGoodsId(wmsInitialExcelInfo.getGoodsSkuSid()));
                     wmsInitialDetail.setGoodsSpuSid(wmsInitialExcelInfo.getGoodsSpuSid());
                     wmsInitialDetail.setGoodsSpuName(wmsInitialExcelInfo.getGoodsSpuName());
                     wmsInitialDetail.setGoodsSkuSid(wmsInitialExcelInfo.getGoodsSkuSid());
@@ -220,6 +224,13 @@ public class WmsInitialRest {
         }
     }
 
+    @PostMapping("/generateGoodsTag")
+    @ResponseBody
+    @ApiOperation(value = "生成商品标签")
+    public ResultBean generateGoodsTag(@RequestBody String[] sids){
+        return wmsInitialDetailService.generateGoodsTag(sids);
+    }
+
     private ReturnExcelInfo getSheetVal(Sheet sheet, int[] resultCell, String deptSid) {
         ReturnExcelInfo importReturn = new ReturnExcelInfo();
         List<WmsInitialExcelInfo> importVoList = new ArrayList<>();

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetail.java

@@ -42,6 +42,8 @@ public class WmsInitialDetail extends BaseEntity {
 
     @ApiModelProperty("单据sid")
     private String billSid; // 单据sid
+    @ApiModelProperty("商品ID")
+    private String goodsID;
     @ApiModelProperty("商品spuSid")
     private String goodsSpuSid; // 商品spuSid
     @ApiModelProperty("商品spu名称")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailMapper.java

@@ -36,4 +36,6 @@ import org.apache.ibatis.annotations.Param;
 public interface WmsInitialDetailMapper extends BaseMapper<WmsInitialDetail> {
 
 	IPage<WmsInitialDetailVo> selectPageVo(IPage<WmsInitialDetail> page, @Param(Constants.WRAPPER) Wrapper<WmsInitialDetail> qw);
+
+	String selectNum(String goodsId);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailMapper.xml

@@ -16,4 +16,12 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="selectNum" resultType="java.lang.String">
+        select RIGHT (goodsID, 4)
+        from wms_inventory
+        where goodsID LIKE concat(#{bill}, '%')
+        order by id desc
+            limit 1
+    </select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailService.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.wms.biz.inventory.wmsinitialdetail;
 
+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.service.MybatisBaseService;
@@ -32,18 +33,24 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.inventory.wmsgoodstag.WmsGoodsTag;
+import com.yxt.wms.biz.inventory.wmsgoodstag.WmsGoodsTagService;
 import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
 import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+
 @Service
 public class WmsInitialDetailService extends MybatisBaseService<WmsInitialDetailMapper, WmsInitialDetail> {
 
 	@Autowired
 	private SysUserFeign sysUserFeign;
-	
+	@Autowired
+	private WmsGoodsTagService wmsGoodsTagService;
+
 	public PagerVo<WmsInitialDetailVo> listPageVo(PagerQuery<WmsInitialDetailQuery> pq) {
 		WmsInitialDetailQuery query = pq.getParams();
 		QueryWrapper<WmsInitialDetail> qw = new QueryWrapper<>();
@@ -103,6 +110,30 @@ public class WmsInitialDetailService extends MybatisBaseService<WmsInitialDetail
 	}
 
 	public String selectNum(String goodsId) {
-		return null;
+		return baseMapper.selectNum(goodsId);
+	}
+
+	public ResultBean generateGoodsTag(String[] sids) {
+		ResultBean rb = ResultBean.fireFail();
+		for (String sid : sids) {
+			WmsInitialDetail wmsInitialDetail = fetchBySid(sid);
+			//新增标签
+			WmsGoodsTag wmsGoodsTag = new WmsGoodsTag();
+			wmsGoodsTag.setState(0);
+			wmsGoodsTag.setCreateBySid(wmsInitialDetail.getCreateBySid());
+			wmsGoodsTag.setBillSid(wmsInitialDetail.getBillSid());
+			wmsGoodsTag.setBillDetailSid(sid);
+			wmsGoodsTag.setGoodsID(wmsInitialDetail.getGoodsID());
+			wmsGoodsTag.setGoodsSpuSid(wmsInitialDetail.getGoodsSpuSid());
+			wmsGoodsTag.setGoodsSpuName(wmsInitialDetail.getGoodsSpuName());
+			wmsGoodsTag.setGoodsSkuSid(wmsInitialDetail.getGoodsSkuSid());
+			wmsGoodsTag.setGoodsSkuTitle(wmsInitialDetail.getGoodsSkuTitle());
+			wmsGoodsTag.setGoodsSkuCode(wmsInitialDetail.getGoodsSkuCode());
+			wmsGoodsTag.setGoodsSkuOwnSpec(wmsInitialDetail.getGoodsSkuOwnSpec());
+			wmsGoodsTag.setUnit(wmsInitialDetail.getUnit());
+			wmsGoodsTag.setGoodsCount(wmsInitialDetail.getNum());
+			wmsGoodsTagService.insert(wmsGoodsTag);
+		}
+		return rb.success();
 	}
 }