Merge branch 'demo_' of http://123.60.19.203:8088/hitch/hitch-sb into demo_

platform-service/src/main/java/com/platform/service/sb/impl/SbMeasureLogServiceImpl.java

@@ -151,6 +151,11 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
             return null;
         }else{
             model.setCheckUserId(SecurityUtils.getUserInfo().getUserId()); // 谁操作即是检定记录人
+            if(SbUseType.BGCL.getValue().equals(sbInfo.getUseType())){
+                model.setType(1);
+            }else if(SbUseType.TZSB.getValue().equals(sbInfo.getUseType())){
+                model.setType(2);
+            }
             SbMeasureLog sbMeasureLog = super.saveModelByDTO(model);
             model.setId(sbMeasureLog.getId());
             tempInfo.setParentId(sbInfo.getParentId());

platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -277,7 +277,7 @@ public class YongyouServiceImpl implements YongyouService {
         otherOutMain.setVt_id("85");
         otherOutMain.setBisstqc(false);
         otherOutMain.setCcode("0000000006");
-        otherOutMain.setCrdcode("202"); // 材料出库
+        otherOutMain.setCrdcode(outStoreFormVO.getType()+""); // 出库类型
         otherOutMain.setCsource("库存");
         otherOutMain.setCdefine14(outStoreFormVO.getId());// 保存设备系统的单据id
         otherOutMain.setCmaker(outStoreFormVO.getCreatedUserName());// 申请人名称