提交

src/main/java/cn/ezhizao/project/business/controller/Inc10101Controller.java

@@ -4,6 +4,8 @@ import cn.ezhizao.framework.web.controller.BaseController;
 import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.project.business.domain.*;
 import cn.ezhizao.project.business.service.*;
+import cn.ezhizao.project.system.domain.SysUser;
+import cn.ezhizao.project.system.service.ISysUserService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,6 +36,8 @@ public class Inc10101Controller extends BaseController {
     @Resource
     private IBizAccessoriesService bizAccessoriesService;
     @Resource
+    private ISysUserService userService;
+    @Resource
     private IBizPullP2TimeService pullP2TimeService;
 
     @GetMapping("/getP2CompanyProductPackage")
@@ -68,6 +72,7 @@ public class Inc10101Controller extends BaseController {
         List<BizProduct> bizProducts = bizProductService.query().list();
         List<BizCompany> bizCompanies = bizCompanyService.query().list();
         List<BizAccessories> bizAccessories = bizAccessoriesService.query().list();
+        List<SysUser> sysUsers = userService.getList();
 
         inc10101List.forEach(l -> {
             // 判断之前是否有这个辅料
@@ -75,6 +80,16 @@ public class Inc10101Controller extends BaseController {
                 // 已插入材料
                 BizCompanyProductPackage oldItem = bizCompanyProductPackages.stream().filter(v -> v.getCompanyCode().equals(l.getCust().trim()) && v.getProductCode().equals(l.getCpart().trim()) && v.getPackageCode().equals(l.getPart().trim())).findFirst().orElse(null);
                 oldItem.setByInc10101(l);
+
+                if (oldItem.getXsyno() != null) {
+                    oldItem.setXsyId(sysUsers.stream().filter(v -> v.getUserName().equals(oldItem.getXsyno())).findFirst().orElse(new SysUser()).getUserId());
+                }
+                if (oldItem.getBgyno() != null) {
+                    oldItem.setBgyId(sysUsers.stream().filter(v -> v.getUserName().equals(oldItem.getXsyno())).findFirst().orElse(new SysUser()).getUserId());
+                }
+                if (oldItem.getJsyno() != null) {
+                    oldItem.setJsyId(sysUsers.stream().filter(v -> v.getUserName().equals(oldItem.getXsyno())).findFirst().orElse(new SysUser()).getUserId());
+                }
                 updateMachineCenter.add(oldItem);
             } else {
                 BizCompanyProductPackage newItem = new BizCompanyProductPackage(l);
@@ -87,6 +102,15 @@ public class Inc10101Controller extends BaseController {
                 if (newItem.getPackageCode() != null) {
                     newItem.setAccessoriesId(bizAccessories.stream().filter(v -> v.getAccessoriesCode().equals(newItem.getPackageCode())).findFirst().orElse(new BizAccessories()).getId());
                 }
+                if (newItem.getXsyno() != null) {
+                    newItem.setXsyId(sysUsers.stream().filter(v -> v.getUserName().equals(newItem.getXsyno())).findFirst().orElse(new SysUser()).getUserId());
+                }
+                if (newItem.getBgyno() != null) {
+                    newItem.setBgyId(sysUsers.stream().filter(v -> v.getUserName().equals(newItem.getXsyno())).findFirst().orElse(new SysUser()).getUserId());
+                }
+                if (newItem.getJsyno() != null) {
+                    newItem.setJsyId(sysUsers.stream().filter(v -> v.getUserName().equals(newItem.getXsyno())).findFirst().orElse(new SysUser()).getUserId());
+                }
                 insertMachineCenter.add(newItem);
             }
         });

src/main/java/cn/ezhizao/project/business/domain/BizCompanyProductPackage.java

@@ -156,6 +156,38 @@ public class BizCompanyProductPackage extends BaseEntity
     @ApiModelProperty(value = "外箱高度")
     private Long tenantId;
 
+    private Long xsyId;
+    private Long bgyId;
+    private Long jsyId;
+    /** 销售员号 */
+    @Excel(name = "销售员号")
+    @ApiModelProperty(value = "销售员号")
+    private String xsyno;
+
+    /** 销售员名 */
+    @Excel(name = "销售员名")
+    @ApiModelProperty(value = "销售员名")
+    private String xsyna;
+
+    /** 保管员号 */
+    @Excel(name = "保管员号")
+    @ApiModelProperty(value = "保管员号")
+    private String bgyno;
+
+    /** 保管员名 */
+    @Excel(name = "保管员名")
+    @ApiModelProperty(value = "保管员名")
+    private String bgyna;
+    /** 技术员号 */
+    @Excel(name = "技术员号")
+    @ApiModelProperty(value = "技术员号")
+    private String jsyno;
+
+    /** 技术员名 */
+    @Excel(name = "技术员名")
+    @ApiModelProperty(value = "技术员名")
+    private String jsyna;
+
     public BizCompanyProductPackage() {
         super();
     }
@@ -187,6 +219,13 @@ public class BizCompanyProductPackage extends BaseEntity
         this.unit = l.getUnit() == null ? "" : l.getUnit().trim();
         this.deliveryStatus = l.getSta() == null ? "" : l.getSta().trim();
         this.outboxHeight = l.getWxgd();
+        this.bgyno = l.getBgyno() == null ? "" : l.getBgyno().trim();
+        this.bgyna = l.getBgyna() == null ? "" : l.getBgyna().trim();
+        this.xsyno = l.getXsyno() == null ? "" : l.getXsyno().trim();
+        this.xsyna = l.getXsyna() == null ? "" : l.getXsyna().trim();
+        this.jsyno = l.getJsyno() == null ? "" : l.getJsyno().trim();
+        this.jsyna = l.getJsyna() == null ? "" : l.getJsyna().trim();
+
     }
 
     public void setByInc10101(Inc10101 l) {
@@ -214,5 +253,11 @@ public class BizCompanyProductPackage extends BaseEntity
         this.unit = l.getUnit() == null ? "" : l.getUnit().trim();
         this.deliveryStatus = l.getSta() == null ? "" : l.getSta().trim();
         this.outboxHeight = l.getWxgd();
+        this.bgyno = l.getBgyno() == null ? "" : l.getBgyno().trim();
+        this.bgyna = l.getBgyna() == null ? "" : l.getBgyna().trim();
+        this.xsyno = l.getXsyno() == null ? "" : l.getXsyno().trim();
+        this.xsyna = l.getXsyna() == null ? "" : l.getXsyna().trim();
+        this.jsyno = l.getJsyno() == null ? "" : l.getJsyno().trim();
+        this.jsyna = l.getJsyna() == null ? "" : l.getJsyna().trim();
     }
 }