Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java

@@ -250,6 +250,7 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl<StOtherOutRecor
 //				detail.setSirCode(stStockInoutRecordService.generateCode()); // 单据编码
 				detail.setInOutDate(mainInout.getInOutDate());
 				detail.setInOutSource(mainInout.getInOutSource());
+				detail.setShId(stOtherOutRecord.getShId());
 				if(stOtherOutRecord.getShId() == null) {
 					detail.setShId(entity.getShId());
 				}
@@ -291,9 +292,7 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl<StOtherOutRecor
 
 				// 绑定当前明细的ID和出库类型
 				newOutRecord.setSirId(detail.getId());
-				if (stOtherOutRecord.getShId() == null) {
 				newOutRecord.setShId(detail.getShId());
-				}
 				newOutRecord.setOutType(stOtherOutRecord.getOutType());
 				newOutRecord.setBfType(stOtherOutRecord.getBfType());
 				newOutRecord.setBfCode(stOtherOutRecord.getBfCode());