biz-customer | 修改 | 运单提交逻辑调整

mt
2024年12月25日15:03:30

@@ -79,16 +79,19 @@ public class ConsignmentUtil {
                     consignment.setCreateTime(nowDate);
                     consignment.setCreateUserName(user.getUserName());
                     consignment.setCreateUserId(user.getId());
-                    //用户录入数据拷贝
-                    BeanUtils.copyProperties(consignmentBo, consignment);
-                }else {
-                    //用户录入shipperaccount
-                    consignment.setUserInputShipperAccount(consignmentBo.getShipperAccount());
-                    //始发国名称
-                    consignment.setUserInputOriginCountry(consignmentBo.getOriginCountry());
-                    //始发国编码
-                    consignment.setUserInputOriginCountryCode(consignmentBo.getOriginCountryCode());
                 }
+                //运单号
+                consignment.setConsignmentCode(consignmentBo.getConsignmentCode());
+                //目的国全称
+                consignment.setDestinationCountry(consignmentBo.getDestinationCountry());
+                //目的国编码
+                consignment.setDestinationCountryCode(consignmentBo.getDestinationCountryCode());
+                //用户录入shipperaccount
+                consignment.setUserInputShipperAccount(consignmentBo.getShipperAccount());
+                //始发国名称
+                consignment.setUserInputOriginCountry(consignmentBo.getOriginCountry());
+                //始发国编码
+                consignment.setUserInputOriginCountryCode(consignmentBo.getOriginCountryCode());
             } else {
                 consignment.setModifyTime(nowDate);
                 consignment.setModifyUserName(user.getUserName());