Merge remote-tracking branch 'origin/master'

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/HandoverRecordServiceImpl.java

@@ -170,10 +170,10 @@ public class HandoverRecordServiceImpl extends BaseServiceImpl<HandoverRecordMap
                 }
             }
 
-            hr.setHrType(workOrder.getHrTypeBool() == 1 ? HandoverRecord.HR_TYPE_TRANSFER : HandoverRecord.HR_TYPE_IN_WAREHOUSE);
+            hr.setHrType(workOrder.getHrTypeBool() == 1 ? HandoverRecord.HR_TYPE_IN_WAREHOUSE : HandoverRecord.HR_TYPE_TRANSFER);
 
             //如果是返工描述类则需要判定责任部门
-            if (StringUtils.isNotBlank(workOrder.getReworkMemo()) && "1".equals(workOrder.getReInStore()) && workOrder.getHrTypeBool() == 1) {
+            if (StringUtils.isNotBlank(workOrder.getReworkMemo()) && "1".equals(workOrder.getReInStore()) && workOrder.getHrTypeBool() == 0) {
                 hr.setRoamNo("3400");
             } else {
                 hr.setRoamNo(yo.getRoamNo());