Merge remote-tracking branch 'origin/master' into master

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/edgeLibrary/service/impl/StockInfoServiceImpl.java

@@ -387,7 +387,7 @@ public class StockInfoServiceImpl extends SuperServiceImpl<StockInfoMapper, Stoc
         infoBean.setLockStatus("1");
         infoBean.setGoodsId(bomProcedureMeterial.getMeterialId());
         infoBean.setSpecId(bomProcedureMeterial.getMeterialId());
-        infoBean.setGoodsType("1");
+        infoBean.setGoodsType("4");
         infoBean.setNum(1);
         infoBean.setCompleteBatchNo(completeBatchNo);
         if(StringUtil.isEmpty(uniqueCode)){