Ver código fonte

修改erp委外变更单、委外验收单转换,增加企业信息

wangyc 8 anos atrás
pai
commit
3a840aed23

+ 5 - 5
src/main/java/com/uas/platform/b2b/erp/model/MakeChange.java

@@ -1,17 +1,16 @@
 package com.uas.platform.b2b.erp.model;
 
+import com.uas.platform.b2b.model.EnterpriseInfo;
+import com.uas.platform.b2b.model.MakeOrderChange;
+import com.uas.platform.b2b.model.MakeOrderChangeItem;
+import com.uas.platform.b2b.support.SystemSession;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.springframework.util.CollectionUtils;
 
-import com.uas.platform.b2b.model.MakeOrderChange;
-import com.uas.platform.b2b.model.MakeOrderChangeItem;
-import com.uas.platform.b2b.support.SystemSession;
-
 public class MakeChange {
 
 	private Long mc_id;// id
@@ -102,6 +101,7 @@ public class MakeChange {
 		change.setCode(mc_code);
 		change.setDate(mc_indate);
 		change.setEnUU(SystemSession.getUser().getEnterprise().getUu());
+		change.setEnterprise(new EnterpriseInfo(SystemSession.getUser().getEnterprise()));
 		change.setRecorder(mc_recorder);
 		change.setRemark(mc_remark);
 		change.setUserUU(SystemSession.getUser().getUserUU());

+ 2 - 0
src/main/java/com/uas/platform/b2b/erp/model/MakeProdInOut.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.erp.model;
 
+import com.uas.platform.b2b.model.EnterpriseInfo;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -161,6 +162,7 @@ public class MakeProdInOut {
 		accept.setRecorder(this.pi_inoutman);
 		accept.setDate(this.pi_date);
 		accept.setEnUU(SystemSession.getUser().getEnterprise().getUu());
+		accept.setEnterprise(new EnterpriseInfo(SystemSession.getUser().getEnterprise()));
 		accept.setSendCode(this.pi_sendcode);
 		accept.setReceiveName(this.pi_receivename);
 		accept.setReceiveCode(this.pi_receivecode);