Merge remote-tracking branch 'origin/master'

anomaly/pom.xml

@@ -71,5 +71,10 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>commons-net</groupId>
+            <artifactId>commons-net</artifactId>
+            <version>3.1</version>
+        </dependency>
     </dependencies>
 </project>

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java

@@ -6,11 +6,16 @@ import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDto;
 import com.foreverwin.mesnac.anomaly.model.AbnormalBill;
 import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose;
 import com.foreverwin.mesnac.anomaly.service.AbnormalBillService;
+import com.foreverwin.mesnac.anomaly.service.FileUploadedService;
+import com.foreverwin.mesnac.common.dto.SfcDispatchDto;
+import com.foreverwin.mesnac.common.service.SfcDispatchCommonService;
 import com.foreverwin.modular.core.util.FrontPage;
 import com.foreverwin.modular.core.util.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -25,6 +30,13 @@ public class AbnormalBillController {
     @Autowired
     private AbnormalBillService abnormalBillService;
 
+    @Autowired
+    private SfcDispatchCommonService sfcDispatchCommonService;
+
+    @Autowired
+    private FileUploadedService fileUploadedService;
+
+
 
     /**
     * 根据id查询
@@ -152,8 +164,8 @@ public class AbnormalBillController {
      * @return
      */
     @GetMapping("/init")
-    public R init(String messageType){
-        return R.ok(abnormalBillService.init(messageType));
+    public R init(String messageType,String type){
+        return R.ok(abnormalBillService.init(messageType,type));
     }
 
 //    @GetMapping("/findAllUserByUserGroup")
@@ -207,8 +219,8 @@ public class AbnormalBillController {
      * @return
      */
     @GetMapping("/cancelBrowse")
-    public R cancelBrowse(String handle, String cancelBrowse){
-        abnormalBillService.cancelBrowse(handle,cancelBrowse);
+    public R cancelBrowse(String handle, String cancelBrowse,String code){
+        abnormalBillService.cancelBrowse(handle,cancelBrowse,code);
         return R.ok();
     }
 
@@ -217,11 +229,24 @@ public class AbnormalBillController {
         return R.ok(abnormalBillService.backLog(abnormalBillDto));
     }
 
+    /**
+     * 质量异常响应检索
+     * @param abnormalBill
+     * @return
+     */
     @GetMapping("/findAllByAbnormalNo")
     public R findAllByAbnormalNo(AbnormalBill abnormalBill){
         return R.ok(abnormalBillService.findAllByAbnormalNo(abnormalBill));
     }
 
+    /**
+     * 设备异常响应检索
+     */
+    @GetMapping("/findAllByAbnormalNoDevice")
+    public R findAllByAbnormalNoDevice(AbnormalBill abnormalBill){
+        return R.ok(abnormalBillService.findAllByAbnormalNoDevice(abnormalBill));
+    }
+
     /**
      * 响应处理
      * @param abnormalBill
@@ -268,4 +293,24 @@ public class AbnormalBillController {
         abnormalBillService.anomalyShutDown(abnormalBill,abnormalBillDispose);
         return R.ok();
     }
+
+    @GetMapping("/findResrceBySfc")
+    public R findResrceBySfc(SfcDispatchDto sfcDispatch){
+        return R.ok(sfcDispatchCommonService.findResrceBySfc(sfcDispatch));
+    }
+
+    @GetMapping("/show")
+    public R showFile(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        return R.ok(fileUploadedService.showFile(request,response));
+    }
+
+    @PostMapping("/delete")
+    public R delete(String ftpPath,String fileName){
+        return R.ok(fileUploadedService.deleteFile(ftpPath,fileName));
+    }
+
+    @GetMapping("/findUploadPictureByAbnormalBo")
+    public R findUploadPictureByAbnormalBo(AbnormalBill abnormalBill){
+        return R.ok(abnormalBillService.findUploadPictureByAbnormalBo(abnormalBill));
+    }
 }

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/UploadPicturesController.java

@@ -0,0 +1,124 @@
+package com.foreverwin.mesnac.anomaly.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.foreverwin.mesnac.anomaly.model.UploadPictures;
+import com.foreverwin.mesnac.anomaly.service.UploadPicturesService;
+import com.foreverwin.modular.core.util.FrontPage;
+import com.foreverwin.modular.core.util.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ *
+ * @author Leon.L
+ * @since 2021-07-11
+ */
+@RestController
+@RequestMapping("/Z-UPLOAD-PICTURES")
+public class UploadPicturesController {
+
+    @Autowired
+    public UploadPicturesService uploadPicturesService;
+
+    /**
+    * 根据id查询
+    *
+    * @param id 主键
+    * @return
+    */
+    @ResponseBody
+    @GetMapping("/{id:.+}")
+    public R getUploadPicturesById(@PathVariable String id) {
+        return R.ok( uploadPicturesService.getById(id));
+    }
+
+    /**
+     * 查询所有数据
+     *
+     * @return
+     */
+    @ResponseBody
+    @GetMapping("")
+    public R getUploadPicturesList(UploadPictures uploadPictures){
+        List<UploadPictures> result;
+        QueryWrapper<UploadPictures> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(uploadPictures);
+        result = uploadPicturesService.list(queryWrapper);
+        return R.ok(result);
+    }
+
+    /**
+     * 分页查询数据
+     *
+     * @param frontPage  分页信息
+     * @return
+     */
+    @ResponseBody
+    @GetMapping("/page")
+    public R page(FrontPage<UploadPictures> frontPage, UploadPictures uploadPictures){
+        IPage result;
+        QueryWrapper<UploadPictures> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(uploadPictures);
+        if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
+            //TODO modify global query
+            queryWrapper.lambda().and(wrapper -> wrapper
+                .like(UploadPictures::getHandle, frontPage.getGlobalQuery())
+                .or().like(UploadPictures::getSite, frontPage.getGlobalQuery())
+                .or().like(UploadPictures::getPicturePath, frontPage.getGlobalQuery())
+                .or().like(UploadPictures::getPictureAddress, frontPage.getGlobalQuery())
+                .or().like(UploadPictures::getObjectBo, frontPage.getGlobalQuery())
+                .or().like(UploadPictures::getNum, frontPage.getGlobalQuery())
+                .or().like(UploadPictures::getType, frontPage.getGlobalQuery())
+                .or().like(UploadPictures::getCreatedUser, frontPage.getGlobalQuery())
+                .or().like(UploadPictures::getModifiedUser, frontPage.getGlobalQuery())
+    );
+        }
+        result = uploadPicturesService.page(frontPage.getPagePlus(), queryWrapper);
+        return R.ok(result);
+    }
+
+    /**
+     * 新增
+     * @param uploadPictures  传递的实体
+     * @return  null 失败  实体成功
+     */
+    @PostMapping
+    public R save(@RequestBody UploadPictures uploadPictures) {
+        return R.ok(uploadPicturesService.save(uploadPictures));
+    }
+
+    /**
+     * 修改
+     * @param uploadPictures  传递的实体
+     * @return  null 失败  实体成功
+     */
+    @PutMapping
+    public R updateById(@RequestBody UploadPictures uploadPictures) {
+        return R.ok(uploadPicturesService.updateById(uploadPictures));
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     * @return 0 失败  1 成功
+     */
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}")
+    public R removeById(@PathVariable("id") String id){
+        return R.ok(uploadPicturesService.removeById(id));
+    }
+
+    /**
+     * 批量删除对象
+     * @param ids 实体集合ID
+     * @return  0 失败  1 成功
+     */
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.POST, value = "/delete-batch")
+    public R removeByIds(List<String> ids){
+        return R.ok(uploadPicturesService.removeByIds(ids));
+    }
+}

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDisposeDto.java

@@ -144,6 +144,16 @@ public class AbnormalBillDisposeDto extends AbnormalBillDispose {
      */
     private String router;
 
+    /**
+     * 设备描述
+     */
+    private String resrceDescription;
+
+    /**
+     * 上报人员
+     */
+    private String fullName;
+
     public String getAbnormalNo() {
         return abnormalNo;
     }
@@ -360,5 +370,19 @@ public class AbnormalBillDisposeDto extends AbnormalBillDispose {
         this.router = router;
     }
 
+    public String getResrceDescription() {
+        return resrceDescription;
+    }
+
+    public void setResrceDescription(String resrceDescription) {
+        this.resrceDescription = resrceDescription;
+    }
 
+    public String getFullName() {
+        return fullName;
+    }
+
+    public void setFullName(String fullName) {
+        this.fullName = fullName;
+    }
 }

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java

@@ -23,12 +23,24 @@ public class AbnormalBillDto extends AbnormalBill {
     /**
      * 开始时间
      */
-    LocalDateTime startDateTime;
+    private LocalDateTime startDateTime;
 
     /**
      * 结束时间
      */
-    LocalDateTime endDateTime;
+    private LocalDateTime endDateTime;
+
+    private String workCenterDescription;
+
+    private String resrceDescription;
+
+    private String reportUser;
+
+    private String abnormalMethod;
+
+    private String confirmUser;
+
+    private String resolveRemark;
 
     public String getSeq() {
         return seq;
@@ -61,4 +73,54 @@ public class AbnormalBillDto extends AbnormalBill {
     public void setEndDateTime(LocalDateTime endDateTime) {
         this.endDateTime = endDateTime;
     }
+
+    public String getWorkCenterDescription() {
+        return workCenterDescription;
+    }
+
+    public void setWorkCenterDescription(String workCenterDescription) {
+        this.workCenterDescription = workCenterDescription;
+    }
+
+    public String getResrceDescription() {
+        return resrceDescription;
+    }
+
+    public void setResrceDescription(String resrceDescription) {
+        this.resrceDescription = resrceDescription;
+    }
+
+
+
+    public String getAbnormalMethod() {
+        return abnormalMethod;
+    }
+
+    public void setAbnormalMethod(String abnormalMethod) {
+        this.abnormalMethod = abnormalMethod;
+    }
+
+    public String getConfirmUser() {
+        return confirmUser;
+    }
+
+    public void setConfirmUser(String confirmUser) {
+        this.confirmUser = confirmUser;
+    }
+
+    public String getResolveRemark() {
+        return resolveRemark;
+    }
+
+    public void setResolveRemark(String resolveRemark) {
+        this.resolveRemark = resolveRemark;
+    }
+
+    public String getReportUser() {
+        return reportUser;
+    }
+
+    public void setReportUser(String reportUser) {
+        this.reportUser = reportUser;
+    }
 }

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillDisposeMapper.java

@@ -2,6 +2,7 @@ package com.foreverwin.mesnac.anomaly.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDisposeDto;
+import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDto;
 import com.foreverwin.mesnac.anomaly.model.AbnormalBill;
 import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose;
 import org.apache.ibatis.annotations.Param;
@@ -18,7 +19,15 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface AbnormalBillDisposeMapper extends BaseMapper<AbnormalBillDispose> {
 
+    /**
+     * 质量异常检索
+     * @param abnormalBill
+     * @param language
+     * @return
+     */
     AbnormalBillDisposeDto findAllByAbnormalNo(@Param("abnormalBill") AbnormalBill abnormalBill, @Param("language")String language);
 
 
+
+
 }

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java

@@ -20,4 +20,12 @@ import java.util.List;
 public interface AbnormalBillMapper extends BaseMapper<AbnormalBill> {
     List<AbnormalBillDto> backLog(@Param("abnormalBill")AbnormalBillDto abnormalBillDto, @Param("language")String language);
 
+    /**
+     * 设备异常响应检索用
+     * @param abnormalBill
+     * @param language
+     * @return
+     */
+    AbnormalBillDto findAllByAbnormalNoDevice(@Param("abnormalBill")AbnormalBill abnormalBill, @Param("language")String language);
+
 }

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/UploadPicturesMapper.java

@@ -0,0 +1,18 @@
+package com.foreverwin.mesnac.anomaly.mapper;
+
+import com.foreverwin.mesnac.anomaly.model.UploadPictures;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Leon.L
+ * @since 2021-07-11
+ */
+@Repository
+public interface UploadPicturesMapper extends BaseMapper<UploadPictures> {
+
+}

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java

@@ -200,6 +200,14 @@ public class AbnormalBill extends Model<AbnormalBill> {
    @TableField("MODIFIED_DATE_TIME")
    private LocalDateTime modifiedDateTime;
 
+   @TableField(exist = false)
+   private String filePath;
+
+   @TableField(exist = false)
+   private String fileName;
+
+   @TableField(exist = false)
+   private String fileNum;
 
    public String getHandle() {
       return handle;
@@ -481,7 +489,31 @@ public class AbnormalBill extends Model<AbnormalBill> {
       this.modifiedDateTime = modifiedDateTime;
    }
 
-public static final String HANDLE = "HANDLE";
+   public String getFilePath() {
+      return filePath;
+   }
+
+   public void setFilePath(String filePath) {
+      this.filePath = filePath;
+   }
+
+   public String getFileName() {
+      return fileName;
+   }
+
+   public void setFileName(String fileName) {
+      this.fileName = fileName;
+   }
+
+   public String getFileNum() {
+      return fileNum;
+   }
+
+   public void setFileNum(String fileNum) {
+      this.fileNum = fileNum;
+   }
+
+   public static final String HANDLE = "HANDLE";
 
 public static final String SITE = "SITE";
 

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/UploadPictures.java

@@ -0,0 +1,216 @@
+package com.foreverwin.mesnac.anomaly.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Leon.L
+ * @since 2021-07-11
+ */
+
+@TableName("Z_UPLOAD_PICTURES")
+
+public class UploadPictures extends Model<UploadPictures> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+   @TableId(value = "HANDLE", type = IdType.INPUT)
+   private String handle;
+    /**
+     * 站点
+     */
+   @TableField("SITE")
+   private String site;
+    /**
+     * 图片路径
+     */
+   @TableField("PICTURE_PATH")
+   private String picturePath;
+    /**
+     * 图片路径详细地址
+     */
+   @TableField("PICTURE_ADDRESS")
+   private String pictureAddress;
+    /**
+     * 单号
+     */
+   @TableField("OBJECT_BO")
+   private String objectBo;
+    /**
+     * 数量
+     */
+   @TableField("NUM")
+   private String num;
+    /**
+     * 类型
+     */
+   @TableField("TYPE")
+   private String type;
+    /**
+     * 创建人
+     */
+   @TableField("CREATED_USER")
+   private String createdUser;
+    /**
+     * 创建时间
+     */
+   @TableField("CREATED_DATE_TIME")
+   private LocalDateTime createdDateTime;
+    /**
+     * 修改人
+     */
+   @TableField("MODIFIED_USER")
+   private String modifiedUser;
+    /**
+     * 修改日期
+     */
+   @TableField("MODIFIED_DATE_TIME")
+   private LocalDateTime modifiedDateTime;
+
+
+   public String getHandle() {
+      return handle;
+   }
+
+   public void setHandle(String handle) {
+      this.handle = handle;
+   }
+
+   public String getSite() {
+      return site;
+   }
+
+   public void setSite(String site) {
+      this.site = site;
+   }
+
+   public String getPicturePath() {
+      return picturePath;
+   }
+
+   public void setPicturePath(String picturePath) {
+      this.picturePath = picturePath;
+   }
+
+   public String getPictureAddress() {
+      return pictureAddress;
+   }
+
+   public void setPictureAddress(String pictureAddress) {
+      this.pictureAddress = pictureAddress;
+   }
+
+   public String getObjectBo() {
+      return objectBo;
+   }
+
+   public void setObjectBo(String objectBo) {
+      this.objectBo = objectBo;
+   }
+
+   public String getNum() {
+      return num;
+   }
+
+   public void setNum(String num) {
+      this.num = num;
+   }
+
+   public String getType() {
+      return type;
+   }
+
+   public void setType(String type) {
+      this.type = type;
+   }
+
+   public String getCreatedUser() {
+      return createdUser;
+   }
+
+   public void setCreatedUser(String createdUser) {
+      this.createdUser = createdUser;
+   }
+
+   public LocalDateTime getCreatedDateTime() {
+      return createdDateTime;
+   }
+
+   public void setCreatedDateTime(LocalDateTime createdDateTime) {
+      this.createdDateTime = createdDateTime;
+   }
+
+   public String getModifiedUser() {
+      return modifiedUser;
+   }
+
+   public void setModifiedUser(String modifiedUser) {
+      this.modifiedUser = modifiedUser;
+   }
+
+   public LocalDateTime getModifiedDateTime() {
+      return modifiedDateTime;
+   }
+
+   public void setModifiedDateTime(LocalDateTime modifiedDateTime) {
+      this.modifiedDateTime = modifiedDateTime;
+   }
+
+public static final String HANDLE = "HANDLE";
+
+public static final String SITE = "SITE";
+
+public static final String PICTURE_PATH = "PICTURE_PATH";
+
+public static final String PICTURE_ADDRESS = "PICTURE_ADDRESS";
+
+public static final String OBJECT_BO = "OBJECT_BO";
+
+public static final String NUM = "NUM";
+
+public static final String TYPE = "TYPE";
+
+public static final String CREATED_USER = "CREATED_USER";
+
+public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME";
+
+public static final String MODIFIED_USER = "MODIFIED_USER";
+
+public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
+
+
+   @Override
+   protected Serializable pkVal() {
+      return this.handle;
+   }
+
+   @Override
+   public String toString() {
+      return "UploadPictures{" +
+         "handle = " + handle +
+         ", site = " + site +
+         ", picturePath = " + picturePath +
+         ", pictureAddress = " + pictureAddress +
+         ", objectBo = " + objectBo +
+         ", num = " + num +
+         ", type = " + type +
+         ", createdUser = " + createdUser +
+         ", createdDateTime = " + createdDateTime +
+         ", modifiedUser = " + modifiedUser +
+         ", modifiedDateTime = " + modifiedDateTime +
+         "}";
+   }
+}

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java

@@ -6,6 +6,7 @@ import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDisposeDto;
 import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDto;
 import com.foreverwin.mesnac.anomaly.model.AbnormalBill;
 import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose;
+import com.foreverwin.mesnac.anomaly.model.UploadPictures;
 import com.foreverwin.modular.core.util.FrontPage;
 
 import java.util.HashMap;
@@ -46,16 +47,16 @@ public interface AbnormalBillService extends IService<AbnormalBill> {
      * @param abnormalBill
      * @param abnormalBillDispose
      */
-    void generateAbnormalBill(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose,List<String> dutyCauseType,List<String> dutyType);
+    String generateAbnormalBill(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose,List<String> dutyCauseType,List<String> dutyType);
 
-    void cancelBrowse(String handle,String cancelBrowse);
+    void cancelBrowse(String handle,String cancelBrowse,String code);
 
     String anomalyReportDevice(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose);
 
     /**
      * 初始化
      */
-    HashMap<String,Object> init(String messageType);
+    HashMap<String,Object> init(String messageType,String type);
     /**
      * 待办事项
      * @param abnormalBillDto
@@ -68,6 +69,11 @@ public interface AbnormalBillService extends IService<AbnormalBill> {
      */
     AbnormalBillDisposeDto findAllByAbnormalNo(AbnormalBill abnormalBill);
 
+    /**
+     *
+     */
+    AbnormalBillDto findAllByAbnormalNoDevice(AbnormalBill abnormalBill);
+
     /**
      * 响应处理
      * @param abnormalBill
@@ -93,4 +99,17 @@ public interface AbnormalBillService extends IService<AbnormalBill> {
      */
     void anomalyShutDown(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose);
 
+    /**
+     * 放置图片
+     * @param abnormalBill
+     */
+    public void fileUpload(AbnormalBill abnormalBill);
+
+    /**
+     * 查看照片
+     * @param abnormalBill
+     * @return
+     */
+    public UploadPictures findUploadPictureByAbnormalBo(AbnormalBill abnormalBill);
+
 }

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/FileUploadedService.java

@@ -0,0 +1,22 @@
+package com.foreverwin.mesnac.anomaly.service;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @Description TODO
+ * @Author zhaojiawei
+ * @Since 2021-07-11
+ */
+public interface FileUploadedService {
+
+    public void uploadAttachment(MultipartFile fileItem, String site, String taskNo, String fileType);
+
+    public String  showFile(HttpServletRequest request, HttpServletResponse response) throws Exception ;
+
+    public boolean deleteFile(String pathname, String filename);
+
+
+}

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/UploadPicturesService.java

@@ -0,0 +1,28 @@
+package com.foreverwin.mesnac.anomaly.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.foreverwin.mesnac.anomaly.model.UploadPictures;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.foreverwin.modular.core.util.FrontPage;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Leon.L
+ * @since 2021-07-11
+ */
+public interface UploadPicturesService extends IService<UploadPictures> {
+
+    /**
+     *  分页查询
+     * @param frontPage
+     * @return
+     */
+    IPage<UploadPictures> selectPage(FrontPage<UploadPictures> frontPage, UploadPictures uploadPictures);
+
+    List<UploadPictures> selectList(UploadPictures uploadPictures);
+}

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java

@@ -74,9 +74,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
     @Autowired
     private AbnormalBillDisposeMapper abnormalBillDisposeMapper;
 
-    @Autowired
-    private RouterMapper routerMapper;
-
     @Autowired
     private ShopOrderMapper shopOrderMapper;
 
@@ -92,6 +89,10 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
     @Autowired
     private DataFieldListService dataFieldListService;
 
+    @Autowired
+    private UploadPicturesService uploadPicturesService;
+
+
 
     @Override
     public IPage<AbnormalBill> selectPage(FrontPage<AbnormalBill> frontPage, AbnormalBill abnormalBill) {
@@ -112,10 +113,10 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
                                      AbnormalBillDispose abnormalBillDispose,
                                      List<String> dutyCauseType,
                                      List<String> dutyType) {
-        this.generateAbnormalBill(abnormalBill,abnormalBillDispose,dutyCauseType,dutyType);
+        String message = this.generateAbnormalBill(abnormalBill, abnormalBillDispose, dutyCauseType, dutyType);
         this.saveOrUpdate(abnormalBill);
         abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose);
-        return abnormalBill.getAbnormalNo();
+        return message;
     }
 
     @Override
@@ -124,7 +125,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
                                 List<String> ncGroupAndNcCodes,
                                 List<String> dutyCauseType,
                                 List<String> dutyType) {
-        this.generateAbnormalBill(abnormalBill,abnormalBillDispose,dutyCauseType,dutyType);
+        String message = this.generateAbnormalBill(abnormalBill, abnormalBillDispose, dutyCauseType, dutyType);
         //获取当前时间
         LocalDateTime now = LocalDateTime.now();
         //生成不良代码和不良代码组,并把它放到hashMap里面，ncCode是存放在异常单里面的ncCode
@@ -169,13 +170,13 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         }
         this.saveOrUpdate(abnormalBill);
         abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose);
-        return abnormalBill.getAbnormalNo();
+        return message;
     }
 
 
     @Override
     public String anomalyReportDevice(AbnormalBill abnormalBill,AbnormalBillDispose abnormalBillDispose) {
-        this.generateAbnormalBill(abnormalBill,abnormalBillDispose,null,null);
+        String message = this.generateAbnormalBill(abnormalBill, abnormalBillDispose, null, null);
 
         List<NcCode> ncByNG = ncCodeService.findNcByNG(abnormalBill.getMessageType(), abnormalBill.getNcCode());
         if(ncByNG == null || ncByNG.size() <= 0){
@@ -183,11 +184,11 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         }
         this.saveOrUpdate(abnormalBill);
         abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose);
-        return abnormalBill.getAbnormalNo();
+        return message;
     }
 
     @Override
-    public HashMap<String, Object> init(String messageType) {
+    public HashMap<String, Object> init(String messageType,String type) {
         HashMap<String, Object> hashMap = new HashMap<>();
         String site = CommonMethods.getSite();
         //消息类型
@@ -218,6 +219,26 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         dataField.setDataField("RESPONSIBILITY_TYPE");
         List<DataField> dutyTypeList = dataFieldListService.findDataFieldListById(dataField);
         hashMap.put("dutyType",dutyTypeList);
+        //当前登录用户的fullName
+        NwaUser nwaUser = new NwaUser();
+        nwaUser.setSite(site);
+        nwaUser.setUserName(CommonMethods.getUser());
+        List<NwaUser> nwaUsers = nwaUserService.selectList(nwaUser);
+        if(nwaUsers != null){
+            hashMap.put("currentUser",nwaUsers.get(0).getFullName());
+        }
+        //初始化异常单号
+        String abnormalNo = null;
+        //生成异常单号
+        if("Q".equals(type)){//其他异常
+            abnormalNo = nextNumberHelper.getNextNumber(site, "ABNORMAL_OTHER", 1, null).get(0);
+        }else if("Z".equals(type)){//质量异常
+            abnormalNo = nextNumberHelper.getNextNumber(site, "ABNORMAL_QUALITY", 1, null).get(0);
+        }else if("S".equals(type)){//设备异常
+            abnormalNo = nextNumberHelper.getNextNumber(site, "ABNORMAL_DEVICE", 1, null).get(0);
+        }
+        hashMap.put("abnormalNo",abnormalNo);
+
         return hashMap;
     }
 
@@ -240,10 +261,24 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
 
     }
 
+    @Override
+    public AbnormalBillDto findAllByAbnormalNoDevice(AbnormalBill abnormalBill) {
+        String site = CommonMethods.getSite();
+        String local=LocaleContextHolder.getLocale().getLanguage();
+        abnormalBill.setSite(site);
+        if(StringUtil.isEmpty(abnormalBill.getAbnormalNo())){
+            return null;
+        }
+        return abnormalBillMapper.findAllByAbnormalNoDevice(abnormalBill,local);
+    }
+
     @Override
     public void resProcessing(AbnormalBill abnormalBill) {
         String site = CommonMethods.getSite();
-        String user = CommonMethods.getUser();
+        String user = "";
+        if(StringUtil.isBlank(abnormalBill.getResponseUser())){
+            user = CommonMethods.getUser();
+        }
         LocalDateTime now = LocalDateTime.now();
         abnormalBill.setSite(site);
         abnormalBill.setResponseUser(user);
@@ -306,11 +341,10 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         abnormalBillDispose.setHandle(HandleEnum.Z_ABNORMAL_BILL_DISPOSE.getHandle(site,abnormalBill.getAbnormalNo()));
 
         //判断判责提交是否已经填写
-        AbnormalBillDispose abnormalBillDispose1 = abnormalBillDisposeMapper.selectById(abnormalBillDispose.getHandle());
-        if(abnormalBillDispose1 != null){
-            if(!StringUtil.isBlank(abnormalBillDispose1.getDutyCauseType())){
-                throw BusinessException.build("该异常单已经判责提交");
-            }
+        //AbnormalBillDispose abnormalBillDispose1 = abnormalBillDisposeMapper.selectById(abnormalBillDispose.getHandle());
+        AbnormalBill abnormalBill1 = abnormalBillMapper.selectById(abnormalBill.getHandle());
+        if(!"N".equals(abnormalBill1.getStatus()) && !"X".equals(abnormalBill1.getStatus()) ){
+            throw BusinessException.build("该异常单已经判责提交");
         }
         abnormalBill.setStatus(Constants.CORRECTION_CONFIRM);
         abnormalBillDispose.setDutyDateTime(now);
@@ -346,25 +380,14 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
     }
 
     @Override
-    public void generateAbnormalBill(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose,List<String> dutyCauseType,List<String> dutyType) {
+    public String generateAbnormalBill(AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose,List<String> dutyCauseType,List<String> dutyType) {
         String site = CommonMethods.getSite();
+        String message = null;
         LocalDateTime currentTime = LocalDateTime.now();
         String user = CommonMethods.getUser();
-        if(StringUtil.isBlank(abnormalBill.getAbnormalNo())){
-            String abnormalNo = null;
-            //生成异常单号
-            if("Q".equals(abnormalBill.getType())){//其他异常
-                abnormalNo = nextNumberHelper.getNextNumber(site, "ABNORMAL_OTHER", 1, null).get(0);
-            }else if("Z".equals(abnormalBill.getType())){//质量异常
-                abnormalNo = nextNumberHelper.getNextNumber(site, "ABNORMAL_QUALITY", 1, null).get(0);
-            }else if("S".equals(abnormalBill.getType())){//设备异常
-                abnormalNo = nextNumberHelper.getNextNumber(site, "ABNORMAL_DEVICE", 1, null).get(0);
-            }
-            abnormalBill.setAbnormalNo(abnormalNo);
+        if(StringUtil.isBlank(abnormalBill.getAbnormalNo())) {
+            throw BusinessException.build("异常单号不存在");
         }
-
-
-
         abnormalBill.setHandle(HandleEnum.Z_ABNORMAL_BILL.getHandle(site,abnormalBill.getAbnormalNo()));
         //更新的时候，判断该异常当的状态是否为新建
         AbnormalBill abnormalBill1 = abnormalBillMapper.selectById(abnormalBill.getHandle());
@@ -372,6 +395,9 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
             if(!"N".equals(abnormalBill1.getStatus())){
                 throw BusinessException.build("该异常单已经被人处理，不能进行更新");
             }
+            message = "更新成功";
+        }else{
+            message = "保存成功";
         }
         abnormalBillDispose.setAbnormalBillBo(abnormalBill.getHandle());
         abnormalBillDispose.setHandle(HandleEnum.Z_ABNORMAL_BILL_DISPOSE.getHandle(site,abnormalBill.getAbnormalNo()));
@@ -445,19 +471,20 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         if(StringUtil.isBlank(abnormalBill.getSfc()) && !"S".equals(abnormalBill.getType())){
             throw BusinessException.build("产品条码不能为空");
         }
-        if(StringUtil.isBlank(abnormalBill.getResrce())){
-            throw BusinessException.build("设备编号不能为空");
-        }
+//        if(StringUtil.isBlank(abnormalBill.getResrce())){
+//            throw BusinessException.build("设备编号不能为空");
+//        }
         if(!StringUtil.isBlank(abnormalBill.getMessageType())){
             NcGroup messageType = ncGroupMapper.selectById(HandleEnum.NC_GROUP.getHandle(site, abnormalBill.getMessageType()));
             if(messageType == null){
                 throw BusinessException.build("该消息类型不存在");
             }
         }
-        Resrce resrce = resrceMapper.selectById(HandleEnum.RESOURCE.getHandle(site, abnormalBill.getResrce()));
-        if(resrce == null){
-            throw BusinessException.build("该设备编号不存在");
-        }
+
+//        Resrce resrce = resrceMapper.selectById(HandleEnum.RESOURCE.getHandle(site, abnormalBill.getResrce()));
+//        if(resrce == null){
+//            throw BusinessException.build("该设备编号不存在");
+//        }
         //判断不良品数量和问题数量是否为正整数
         try {
             if(!StringUtil.isBlank(abnormalBill.getNcQty()) && Integer.parseInt(abnormalBill.getNcQty()) < 0) {
@@ -471,7 +498,6 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         }
         //判断输入的用户组是否正确，并返回对应的用户
         nwaUserService.checkUserGroup(abnormalBillDispose.getDutySendUserGroup());
-
         //插入原因分类和责任分类
         if(dutyTypes.size() > 0){
             abnormalDutyService.saveOrUpdateBatch(dutyTypes);
@@ -479,18 +505,77 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         if(causeTypes.size() > 0){
             abnormalCauseService.saveOrUpdateBatch(causeTypes);
         }
+        //放置图片
+        this.fileUpload(abnormalBill);
+
+        return message;
 
     }
 
     @Override
-    public void cancelBrowse(String handle, String cancelBrowse) {
+    public void cancelBrowse(String handle, String cancelBrowse,String code) {
         LocalDateTime now = LocalDateTime.now();
         AbnormalBill abnormalBill = abnormalBillMapper.selectById(handle);
         abnormalBill.setStatus(Constants.CANCEL);
         abnormalBill.setCancelReason(cancelBrowse);
+        if(!StringUtil.isBlank(code)){
+            abnormalBill.setCancelCode(code);
+        }
         abnormalBill.setCancelUser(CommonMethods.getUser());
         abnormalBill.setCancelDateTime(now);
         this.saveOrUpdate(abnormalBill);
     }
 
-}
+    @Override
+    public void fileUpload(AbnormalBill abnormalBill){
+        String user = CommonMethods.getUser();
+        LocalDateTime now = LocalDateTime.now();
+        List<String> name = null;
+        if(StringUtil.notBlank(abnormalBill.getFileName())){
+            name = Arrays.asList(abnormalBill.getFileName().split(","));
+        }
+        if(name != null && name.size() != 0){
+            //String uuid = UUID.randomUUID().toString();
+            UploadPictures uploadPictures = new UploadPictures();
+            uploadPictures.setHandle("UploadPicturesBO:"+abnormalBill.getSite()+","+abnormalBill.getAbnormalNo());
+            uploadPictures.setSite(abnormalBill.getSite());
+            uploadPictures.setPicturePath(abnormalBill.getFilePath());
+            StringBuilder pictureAddress = new StringBuilder();
+            for (int i = 0; i <= name.size() -1; i++) {
+                if(i != name.size() -1){
+                    pictureAddress.append(abnormalBill.getFilePath()).append("/").append(name.get(i)).append(",");
+                }else{
+                    pictureAddress.append(abnormalBill.getFilePath()).append("/").append(name.get(i));
+                }
+            }
+            uploadPictures.setPictureAddress(pictureAddress.toString());
+            uploadPictures.setObjectBo(abnormalBill.getHandle());
+            uploadPictures.setNum(abnormalBill.getFileNum());
+            uploadPictures.setType("ABNORMAL");
+            uploadPictures.setCreatedUser(user);
+            uploadPictures.setCreatedDateTime(now);
+            uploadPictures.setModifiedUser(user);
+            uploadPictures.setModifiedDateTime(now);
+            uploadPicturesService.saveOrUpdate(uploadPictures);
+        }
+    }
+
+    @Override
+    public UploadPictures findUploadPictureByAbnormalBo(AbnormalBill abnormalBill) {
+        String site = CommonMethods.getSite();
+        UploadPictures uploadPictures = new UploadPictures();
+        uploadPictures.setSite(site);
+        uploadPictures.setObjectBo(abnormalBill.getHandle());
+        List<UploadPictures> uploadPictures1 = uploadPicturesService.selectList(uploadPictures);
+        if(uploadPictures1 != null && uploadPictures1.size() == 1){
+            return  uploadPictures1.get(0);
+        }
+        return null;
+    }
+}
+
+
+
+
+
+

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/FileUploadedServiceImpl.java

@@ -0,0 +1,167 @@
+package com.foreverwin.mesnac.anomaly.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.ftp.Ftp;
+import com.foreverwin.mesnac.anomaly.service.FileUploadedService;
+import com.foreverwin.modular.core.exception.BusinessException;
+import com.foreverwin.modular.core.util.CommonMethods;
+import org.apache.commons.net.ftp.FTP;
+import org.apache.commons.net.ftp.FTPClient;
+import org.apache.commons.net.ftp.FTPReply;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * @Description TODO
+ * @Author zhaojiawei
+ * @Since 2021-07-10
+ */
+@Service("FileUploaded")
+@Transactional(rollbackFor = Exception.class)
+@ConditionalOnProperty( prefix = "ftp",name = {"host","port","username","password"})
+public class FileUploadedServiceImpl implements FileUploadedService {
+
+    @Value("${ftp.host}")
+    private String host;
+    @Value("${ftp.port}")
+    private Integer port;
+    @Value("${ftp.username}")
+    private String username;
+    @Value("${ftp.password}")
+    private String password;
+
+    private final static Logger logger = LoggerFactory.getLogger("FileUploadedServiceImpl");
+
+    /**
+     * 附件上传
+     *
+     * @param fileItem
+     * @return
+     */
+    @Override
+    public void uploadAttachment(MultipartFile fileItem,String site,String taskNo,String fileType) {
+        if (StrUtil.isBlank(site)) {
+            site = CommonMethods.getSite();
+        }
+        //上传附件目录：年/月/日
+        String path =  LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy/MM/dd"))+"/"+taskNo;
+        //上传附件名称
+        String fileName = fileItem.getOriginalFilename();
+        try {
+            Ftp ftp = new Ftp(host, port,username,password);
+
+            ftp.upload(path, fileName, fileItem.getInputStream());
+            ftp.close();
+        } catch (IOException e) {
+            logger.info(e.getMessage());
+            throw BusinessException.build("" + e.getMessage());
+        }
+        
+    }
+
+    public String showFile(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        String path = request.getParameter("PATH");
+//        InputStream in = null;
+        OutputStream out = null;
+        try {
+            String coderPath = new String(path.getBytes("ISO8859_1"));
+            String newPath = new String(coderPath.getBytes("GBK"), FTPClient.DEFAULT_CONTROL_ENCODING);
+            //
+            // in = ftpClient.getFtp(path);
+//            in = ftpClient.getFtp(newPath);
+            FTPClient ftpClient = new FTPClient();
+            ftpClient.connect(host,port);
+            ftpClient.login(username,password);
+            if(!FTPReply.isPositiveCompletion(ftpClient.getReplyCode())){
+                ftpClient.disconnect();
+            }
+            ftpClient.enterLocalActiveMode();
+            // 设置文件类型为二进制，与ASCII有区别
+            ftpClient.setFileType(FTP.BINARY_FILE_TYPE);
+            // 设置编码格式
+            ftpClient.setControlEncoding("GBK");
+            // 提取绝对地址的目录以及文件名
+            path = path.replace("ftp://"+path+":"+port+"/", "");
+            String dir = path.substring(0, path.lastIndexOf("/"));
+            String file = path.substring(path.lastIndexOf("/")+1);
+            // 进入文件所在目录，注意编码格式，以能够正确识别中文目录
+            boolean cdStatus = ftpClient.changeWorkingDirectory(new String(dir.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
+            // 检验文件是否存在
+            InputStream in = ftpClient.retrieveFileStream(new String(file.getBytes("GBK"),FTP.DEFAULT_CONTROL_ENCODING));
+            if(in == null || ftpClient.getReplyCode() == FTPReply.FILE_UNAVAILABLE){
+                return "该文件不存在";
+            }
+
+            ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+            byte[] buffer = new byte[1024];
+            int len = 0;
+            while( (len=in.read(buffer)) != -1 ){
+                outStream.write(buffer, 0, len);
+            }
+            byte[] data = outStream.toByteArray();
+            out = response.getOutputStream();
+            out.write(data);
+            out.flush();
+        }catch (Exception e){
+            return "图片获取失败"+e.getMessage();
+        }finally {
+            out.close();
+//            in.close();
+        }
+
+        return "渲染图片成功";
+    }
+
+    @Override
+    public boolean deleteFile(String pathname, String filename){
+        boolean flag = false;
+        FTPClient ftpClient = null;
+        try {
+            //System.out.println("开始删除文件");
+             ftpClient = new FTPClient();
+            ftpClient.connect(host,port);
+            ftpClient.login(username,password);
+            if(!FTPReply.isPositiveCompletion(ftpClient.getReplyCode())){
+                ftpClient.disconnect();
+            }
+            ftpClient.enterLocalActiveMode();
+            // 设置文件类型为二进制，与ASCII有区别
+            ftpClient.setFileType(FTP.BINARY_FILE_TYPE);
+            // 设置编码格式
+            ftpClient.setControlEncoding("GBK");
+            //切换FTP目录
+            ftpClient.changeWorkingDirectory(pathname);
+            ftpClient.dele(filename);
+            ftpClient.logout();
+            flag = true;
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        } finally {
+            if(ftpClient.isConnected()){
+                try{
+                    ftpClient.disconnect();
+                }catch(IOException e){
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+
+}

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/UploadPicturesServiceImpl.java

@@ -0,0 +1,46 @@
+package com.foreverwin.mesnac.anomaly.service.impl;
+
+import com.foreverwin.modular.core.util.FrontPage;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.foreverwin.mesnac.anomaly.model.UploadPictures;
+import com.foreverwin.mesnac.anomaly.mapper.UploadPicturesMapper;
+import com.foreverwin.mesnac.anomaly.service.UploadPicturesService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Leon.L
+ * @since 2021-07-11
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class UploadPicturesServiceImpl extends ServiceImpl<UploadPicturesMapper, UploadPictures> implements UploadPicturesService {
+
+
+    @Autowired
+    private UploadPicturesMapper uploadPicturesMapper;
+
+    @Override
+    public IPage<UploadPictures> selectPage(FrontPage<UploadPictures> frontPage, UploadPictures uploadPictures) {
+        QueryWrapper<UploadPictures> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(uploadPictures);
+        return super.page(frontPage.getPagePlus(), queryWrapper);
+    }
+
+    @Override
+    public List<UploadPictures> selectList(UploadPictures uploadPictures) {
+        QueryWrapper<UploadPictures> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(uploadPictures);
+        return super.list(queryWrapper);
+    }
+
+
+}

anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml

@@ -32,7 +32,7 @@
         <result column="MODIFIED_DATE_TIME" property="modifiedDateTime" />
     </resultMap>
 
-    <!--异常响应界面检索用-->
+    <!--质量异常响应界面检索用-->
     <resultMap id="AbnormalBillDisposeDto" type="com.foreverwin.mesnac.anomaly.dto.AbnormalBillDisposeDto" extends="BaseResultMap">
         <result column="ABNORMAL_NO" property="abnormalNo"/>
         <result column="STATUS" property="status"/>
@@ -61,6 +61,8 @@
         <result column="OBJECT_BO" property="objectBo"/>
         <result column="PB_PHOTOSHOP" property="pbPhotoShop"/>
         <result column="ROUTER" property="router"/>
+        <result column="RESRCE_DESCRIPTION" property="resrceDescription"/>
+        <result column="FULL_NAME" property="fullName"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -616,7 +618,7 @@
                ZAB."TYPE" "TYPE" ,ZAB.SFC SFC,ZAB.MESSAGE_TYPE MESSAGE_TYPE,ZAB.SHOP_ORDER SHOP_ORDER,
                ZAB.WORK_CENTER WORK_CENTER,ZAB.RESRCE RESRCE, WORKORDER.VALUE WORK_ORDER,ITEMNUMBER.VALUE ITEM_NUMBER,
                PRODUCTCATEGORY.VALUE PRODUCT_CATEGORY,listagg(NCT2.DESCRIPTION || '/'||NCT.DESCRIPTION || ',') within GROUP(ORDER BY zab.ABNORMAL_NO) NC_CODE  , ZAB.PB_DESCRIPTION PB_DESCRIPTION ,ZAB.NC_QTY NC_QTY,
-	   ZAB.PB_GRADE PB_GRADE ,ZAB.PB_USER PB_USER ,ZAB.PB_QTY PB_QTY ,ZAB.DISCOVER DISCOVER ,
+	   ZAB.PB_GRADE PB_GRADE ,NWA.FULL_NAME PB_USER ,ZAB.PB_QTY PB_QTY ,ZAB.DISCOVER DISCOVER ,
 	   ZAB.INSPECTOR INSPECTOR ,ZAB.ENTITY_LOCATION ENTITY_LOCATION ,ZAB.REPORT_FROM REPORT_FROM ,ZAB.OBJECT_BO OBJECT_BO ,
 	   ZAB.PB_PHOTOSHOP PB_PHOTOSHOP,ZABD.DUTY_CAUSE_DESCRIPTION DUTY_CAUSE_DESCRIPTION,ZABD.DUTY_CAUSE_TYPE DUTY_CAUSE_TYPE,ZABD.DUTY_DEPART DUTY_DEPART,
 	   ZABD.DUTY_SEND_USER_GROUP DUTY_SEND_USER_GROUP,ZABD.DUTY_TYPE DUTY_TYPE,ZABD.PRINCIPAL_USER PRINCIPAL_USER,ZABD.ABNORMAL_METHOD ABNORMAL_METHOD,
@@ -634,6 +636,7 @@
             LEFT JOIN CUSTOM_FIELDS "MAP" ON "MAP".HANDLE = SO.HANDLE AND "MAP"."ATTRIBUTE" = 'MAP'
             LEFT JOIN Z_ABNORMAL_NC_CODE ZANC ON ZAB.HANDLE = ZANC.ABNORMAL_BILL_BO
             LEFT JOIN NC_CODE_T NCT ON ('NCCodeBO:' || ZAB.SITE || ',' || ZANC.NC_CODE) = NCT.NC_CODE_BO AND NCT.LOCALE = #{language}
+            INNER JOIN Z_NWA_USER NWA ON NWA.USER_NAME = ZAB.PB_USER AND NWA.SITE = ZAB.SITE
             LEFT  JOIN NC_CODE_T NCT2 ON ('NCCodeBO:' || ZAB.SITE || ',' || ZANC.NC_CODE_GROUP) = NCT2.NC_CODE_BO AND NCT2.LOCALE = #{language}
             LEFT JOIN ROUTER R ON SUBSTR(R.HANDLE,1,INSTR(R.HANDLE,',',-1)-1) = SUBSTR(ZABD.ROUTER_BO,1,INSTR(ZABD.ROUTER_BO,',',-1)-1) AND R.CURRENT_REVISION = 'true'
         <where>
@@ -651,11 +654,14 @@
             ZAB."TYPE"  ,ZAB.SFC ,ZAB.MESSAGE_TYPE ,ZAB.SHOP_ORDER ,
             ZAB.WORK_CENTER ,ZAB.RESRCE , WORKORDER.VALUE ,ITEMNUMBER.VALUE ,
             PRODUCTCATEGORY.VALUE, ZAB.PB_DESCRIPTION  ,ZAB.NC_QTY ,
-            ZAB.PB_GRADE  ,ZAB.PB_USER  ,ZAB.PB_QTY  ,ZAB.DISCOVER  ,
+            ZAB.PB_GRADE  ,NWA.FULL_NAME  ,ZAB.PB_QTY  ,ZAB.DISCOVER  ,
             ZAB.INSPECTOR  ,ZAB.ENTITY_LOCATION  ,ZAB.REPORT_FROM  ,ZAB.OBJECT_BO  ,
             ZAB.PB_PHOTOSHOP ,ZABD.DUTY_CAUSE_DESCRIPTION ,ZABD.DUTY_CAUSE_TYPE ,ZABD.DUTY_DEPART ,
             ZABD.DUTY_SEND_USER_GROUP ,ZABD.DUTY_TYPE ,ZABD.PRINCIPAL_USER ,ZABD.ABNORMAL_METHOD ,
             R.ROUTER ,ZABD.RESOLVE_SHOP_ORDER ,ZABD.RESOLVE_REMARK ,ZABD.RESOLVE_SEND_USER ,
             ZABD.ABNORMAL_REASON ,ZABD.BEFORE_MEASURE ,"MAP".VALUE,ZABD.ROUTER_BO
+
     </select>
+
+
 </mapper>

anomaly/src/main/resources/mapper/AbnormalBillMapper.xml

@@ -46,6 +46,15 @@
         <result column="ITEM_DESCRIPTION" property="itemDescription"/>
         <result column="START_DATE_TIME" property="startDateTime"/>
         <result column="END_DATE_TIME" property="endDateTime"/>
+        <result column="WORK_CENTER_DESCRIPTION" property="workCenterDescription"/>
+        <result column="RESRCE_DESCRIPTION" property="resrceDescription"/>
+        <result column="REPORT_USER" property="reportUser"/>
+        <result column="RESPONSE_USER" property="responseUser"/>
+        <result column="RESPONSE_DATE_TIME" property="responseDateTime"/>
+        <result column="ABNORMAL_METHOD" property="abnormalMethod"/>
+        <result column="CONFIRM_USER" property="confirmUser"/>
+        <result column="RESOLVE_REMARK" property="resolveRemark"/>
+        <result column="CANCEL_UESR" property="cancelUser"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -850,5 +859,30 @@
     </select>
     <!--根-->
 
-
+    <select id="findAllByAbnormalNoDevice" resultMap="abnormalBillDto">
+        SELECT ZAB.ABNORMAL_NO ABNORMAL_NO , ZAB.STATUS STATUS ,ZAB.REPORT_FROM  REPORT_FROM ,WCT.DESCRIPTION  WORK_CENTER_DESCRIPTION,
+               ZAB.RESRCE RESRCE ,R.DESCRIPTION RESRCE_DESCRIPTION,ZNU.FULL_NAME REPORT_USER,ZAB.MESSAGE_TYPE MESSAGE_TYPE ,
+               ZAB.NC_CODE  NC_CODE ,ZAB.PB_DESCRIPTION PB_DESCRIPTION ,ZAB.SHUT_DOWN SHUT_DOWN ,ZAB.RESPONSE_USER RESPONSE_USER,ZAB.RESPONSE_DATE_TIME RESPONSE_DATE_TIME,
+               ZABD.ABNORMAL_METHOD ABNORMAL_METHOD,ZNU3.FULL_NAME CONFIRM_USER,ZABD.RESOLVE_REMARK RESOLVE_REMARK,ZAB.CANCEL_USER,
+               ZAB.CANCEL_CODE CANCEL_CODE,ZAB.CANCEL_DATE_TIME CANCEL_DATE_TIME,ZNU4.FULL_NAME CANCEL_USER,ZAB.CANCEL_REASON CANCEL_REASON
+        FROM
+            Z_ABNORMAL_BILL ZAB
+                INNER JOIN Z_ABNORMAL_BILL_DISPOSE ZABD ON ZABD.ABNORMAL_BILL_BO  = ZAB.HANDLE
+                INNER JOIN RESRCE R ON R.RESRCE = ZAB.RESRCE AND R.SITE = ZAB.SITE
+                LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO  = ('WORKCENTERBO:' || ZAB.SITE || ',' || ZAB.WORK_CENTER) AND WCT.LOCALE =#{language}
+                LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME  = ZAB.CREATED_USER AND ZNU.SITE = ZAB.SITE
+                LEFT JOIN Z_NWA_USER ZNU2 ON ZNU2.USER_NAME = ZAB.RESPONSE_USER AND  ZNU2.SITE = ZAB.SITE
+                LEFT JOIN Z_NWA_USER ZNU3 ON ZNU3.USER_NAME = ZABD.RESOLVE_USER AND  ZNU3.SITE = ZAB.SITE
+                LEFT JOIN Z_NWA_USER ZNU4 ON ZNU4.USER_NAME = ZAB.CANCEL_CODE AND  ZNU4.SITE = ZAB.SITE
+        <where>
+            <if test="abnormalBill != null">
+                <if test="abnormalBill.site != null and abnormalBill.site != ''">
+                    ZAB.SITE = #{abnormalBill.site}
+                </if>
+                <if test="abnormalBill.abnormalNo != null and abnormalBill.abnormalNo != ''">
+                    AND ZAB.ABNORMAL_NO = #{abnormalBill.abnormalNo}
+                </if>
+            </if>
+        </where>
+    </select>
 </mapper>

anomaly/src/main/resources/mapper/UploadPicturesMapper.xml

@@ -0,0 +1,418 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.foreverwin.mesnac.anomaly.mapper.UploadPicturesMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.foreverwin.mesnac.anomaly.model.UploadPictures">
+        <id column="HANDLE" property="handle" />
+        <result column="SITE" property="site" />
+        <result column="PICTURE_PATH" property="picturePath" />
+        <result column="PICTURE_ADDRESS" property="pictureAddress" />
+        <result column="OBJECT_BO" property="objectBo" />
+        <result column="NUM" property="num" />
+        <result column="TYPE" property="type" />
+        <result column="CREATED_USER" property="createdUser" />
+        <result column="CREATED_DATE_TIME" property="createdDateTime" />
+        <result column="MODIFIED_USER" property="modifiedUser" />
+        <result column="MODIFIED_DATE_TIME" property="modifiedDateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        HANDLE, SITE, PICTURE_PATH, PICTURE_ADDRESS, OBJECT_BO, NUM, TYPE, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME
+    </sql>
+
+    <!-- BaseMapper标准查询/修改/删除 -->
+    <select id="selectById" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"></include> FROM Z_UPLOAD_PICTURES WHERE HANDLE=#{handle}
+    </select>
+
+    <select id="selectByMap" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"></include>
+        FROM Z_UPLOAD_PICTURES
+        <if test="cm!=null and !cm.isEmpty">
+            <where>
+                <foreach collection="cm.keys" item="k" separator="AND">
+                    <if test="cm[k] != null">
+                        ${k} = #{cm[${k}]}
+                    </if>
+                </foreach>
+            </where>
+        </if>
+    </select>
+
+    <select id="selectBatchIds" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"></include>
+        FROM Z_UPLOAD_PICTURES WHERE HANDLE IN (
+        <foreach item="item" index="index" collection="coll" separator=",">#{item}
+        </foreach>)
+    </select>
+
+    <select id="selectOne" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"></include> FROM Z_UPLOAD_PICTURES
+        <where>
+            <if test="ew.entity.handle!=null">
+              HANDLE=#{ew.handle}
+            </if>
+            <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+            <if test="ew.entity.picturePath!=null"> AND PICTURE_PATH=#{ew.entity.picturePath}</if>
+            <if test="ew.entity.pictureAddress!=null"> AND PICTURE_ADDRESS=#{ew.entity.pictureAddress}</if>
+            <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
+            <if test="ew.entity.num!=null"> AND NUM=#{ew.entity.num}</if>
+            <if test="ew.entity.type!=null"> AND TYPE=#{ew.entity.type}</if>
+            <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
+            <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+            <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
+            <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+        </where>
+    </select>
+
+    <select id="selectCount" resultType="Integer">
+        SELECT COUNT(1) FROM Z_UPLOAD_PICTURES
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                <if test="ew.entity.handle!=null">
+                    HANDLE=#{ew.entity.handle}
+                </if>
+                <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                <if test="ew.entity.picturePath!=null"> AND PICTURE_PATH=#{ew.entity.picturePath}</if>
+                <if test="ew.entity.pictureAddress!=null"> AND PICTURE_ADDRESS=#{ew.entity.pictureAddress}</if>
+                <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
+                <if test="ew.entity.num!=null"> AND NUM=#{ew.entity.num}</if>
+                <if test="ew.entity.type!=null"> AND TYPE=#{ew.entity.type}</if>
+                <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
+                <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
+                <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectList" resultMap="BaseResultMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_UPLOAD_PICTURES
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.picturePath!=null"> AND PICTURE_PATH=#{ew.entity.picturePath}</if>
+                    <if test="ew.entity.pictureAddress!=null"> AND PICTURE_ADDRESS=#{ew.entity.pictureAddress}</if>
+                    <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
+                    <if test="ew.entity.num!=null"> AND NUM=#{ew.entity.num}</if>
+                    <if test="ew.entity.type!=null"> AND TYPE=#{ew.entity.type}</if>
+                    <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectMaps" resultType="HashMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_UPLOAD_PICTURES
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.picturePath!=null"> AND PICTURE_PATH=#{ew.entity.picturePath}</if>
+                    <if test="ew.entity.pictureAddress!=null"> AND PICTURE_ADDRESS=#{ew.entity.pictureAddress}</if>
+                    <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
+                    <if test="ew.entity.num!=null"> AND NUM=#{ew.entity.num}</if>
+                    <if test="ew.entity.type!=null"> AND TYPE=#{ew.entity.type}</if>
+                    <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectObjs" resultType="Object">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_UPLOAD_PICTURES
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.picturePath!=null"> AND PICTURE_PATH=#{ew.entity.picturePath}</if>
+                    <if test="ew.entity.pictureAddress!=null"> AND PICTURE_ADDRESS=#{ew.entity.pictureAddress}</if>
+                    <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
+                    <if test="ew.entity.num!=null"> AND NUM=#{ew.entity.num}</if>
+                    <if test="ew.entity.type!=null"> AND TYPE=#{ew.entity.type}</if>
+                    <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectPage" resultMap="BaseResultMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_UPLOAD_PICTURES
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.picturePath!=null"> AND PICTURE_PATH=#{ew.entity.picturePath}</if>
+                    <if test="ew.entity.pictureAddress!=null"> AND PICTURE_ADDRESS=#{ew.entity.pictureAddress}</if>
+                    <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
+                    <if test="ew.entity.num!=null"> AND NUM=#{ew.entity.num}</if>
+                    <if test="ew.entity.type!=null"> AND TYPE=#{ew.entity.type}</if>
+                    <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectMapsPage" resultType="HashMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_UPLOAD_PICTURES
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.picturePath!=null"> AND PICTURE_PATH=#{ew.entity.picturePath}</if>
+                    <if test="ew.entity.pictureAddress!=null"> AND PICTURE_ADDRESS=#{ew.entity.pictureAddress}</if>
+                    <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
+                    <if test="ew.entity.num!=null"> AND NUM=#{ew.entity.num}</if>
+                    <if test="ew.entity.type!=null"> AND TYPE=#{ew.entity.type}</if>
+                    <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <insert id="insert" parameterType="com.foreverwin.mesnac.anomaly.model.UploadPictures">
+        INSERT INTO Z_UPLOAD_PICTURES
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            HANDLE,
+            <if test="site!=null">SITE,</if>
+            <if test="picturePath!=null">PICTURE_PATH,</if>
+            <if test="pictureAddress!=null">PICTURE_ADDRESS,</if>
+            <if test="objectBo!=null">OBJECT_BO,</if>
+            <if test="num!=null">NUM,</if>
+            <if test="type!=null">TYPE,</if>
+            <if test="createdUser!=null">CREATED_USER,</if>
+            <if test="createdDateTime!=null">CREATED_DATE_TIME,</if>
+            <if test="modifiedUser!=null">MODIFIED_USER,</if>
+            <if test="modifiedDateTime!=null">MODIFIED_DATE_TIME,</if>
+        </trim> VALUES
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            #{handle},
+            <if test="site!=null">#{site},</if>
+            <if test="picturePath!=null">#{picturePath},</if>
+            <if test="pictureAddress!=null">#{pictureAddress},</if>
+            <if test="objectBo!=null">#{objectBo},</if>
+            <if test="num!=null">#{num},</if>
+            <if test="type!=null">#{type},</if>
+            <if test="createdUser!=null">#{createdUser},</if>
+            <if test="createdDateTime!=null">#{createdDateTime},</if>
+            <if test="modifiedUser!=null">#{modifiedUser},</if>
+            <if test="modifiedDateTime!=null">#{modifiedDateTime},</if>
+        </trim>
+    </insert>
+
+    <insert id="insertAllColumn" parameterType="com.foreverwin.mesnac.anomaly.model.UploadPictures">
+        INSERT INTO Z_UPLOAD_PICTURES
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <include refid="Base_Column_List"></include>
+        </trim> VALUES
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            #{handle},
+            #{site},
+            #{picturePath},
+            #{pictureAddress},
+            #{objectBo},
+            #{num},
+            #{type},
+            #{createdUser},
+            #{createdDateTime},
+            #{modifiedUser},
+            #{modifiedDateTime},
+        </trim>
+    </insert>
+
+
+    <update id="updateById">
+        UPDATE Z_UPLOAD_PICTURES <trim prefix="SET" suffixOverrides=",">
+        <if test="et.site!=null">SITE=#{et.site},</if>
+        <if test="et.picturePath!=null">PICTURE_PATH=#{et.picturePath},</if>
+        <if test="et.pictureAddress!=null">PICTURE_ADDRESS=#{et.pictureAddress},</if>
+        <if test="et.objectBo!=null">OBJECT_BO=#{et.objectBo},</if>
+        <if test="et.num!=null">NUM=#{et.num},</if>
+        <if test="et.type!=null">TYPE=#{et.type},</if>
+        <if test="et.createdUser!=null">CREATED_USER=#{et.createdUser},</if>
+        <if test="et.createdDateTime!=null">CREATED_DATE_TIME=#{et.createdDateTime},</if>
+        <if test="et.modifiedUser!=null">MODIFIED_USER=#{et.modifiedUser},</if>
+        <if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if>
+        </trim> WHERE HANDLE=#{et.handle} <if test="et instanceof java.util.Map"><if test="et.MP_OPTLOCK_VERSION_ORIGINAL!=null">and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}</if></if>
+    </update>
+
+
+    <update id="updateAllColumnById">
+        UPDATE Z_UPLOAD_PICTURES <trim prefix="SET" suffixOverrides=",">
+        SITE=#{et.site},
+        PICTURE_PATH=#{et.picturePath},
+        PICTURE_ADDRESS=#{et.pictureAddress},
+        OBJECT_BO=#{et.objectBo},
+        NUM=#{et.num},
+        TYPE=#{et.type},
+        CREATED_USER=#{et.createdUser},
+        CREATED_DATE_TIME=#{et.createdDateTime},
+        MODIFIED_USER=#{et.modifiedUser},
+        MODIFIED_DATE_TIME=#{et.modifiedDateTime},
+     </trim> WHERE HANDLE=#{et.handle} <if test="et instanceof java.util.Map"><if test="et.MP_OPTLOCK_VERSION_ORIGINAL!=null">and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}</if></if>
+    </update>
+
+
+    <update id="update">
+        UPDATE Z_UPLOAD_PICTURES <trim prefix="SET" suffixOverrides=",">
+        <if test="et.site!=null">SITE=#{et.site},</if>
+        <if test="et.picturePath!=null">PICTURE_PATH=#{et.picturePath},</if>
+        <if test="et.pictureAddress!=null">PICTURE_ADDRESS=#{et.pictureAddress},</if>
+        <if test="et.objectBo!=null">OBJECT_BO=#{et.objectBo},</if>
+        <if test="et.num!=null">NUM=#{et.num},</if>
+        <if test="et.type!=null">TYPE=#{et.type},</if>
+        <if test="et.createdUser!=null">CREATED_USER=#{et.createdUser},</if>
+        <if test="et.createdDateTime!=null">CREATED_DATE_TIME=#{et.createdDateTime},</if>
+        <if test="et.modifiedUser!=null">MODIFIED_USER=#{et.modifiedUser},</if>
+        <if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if>
+    </trim>
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    HANDLE=#{ew.entity.handle}
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.picturePath!=null"> AND PICTURE_PATH=#{ew.entity.picturePath}</if>
+                    <if test="ew.entity.pictureAddress!=null"> AND PICTURE_ADDRESS=#{ew.entity.pictureAddress}</if>
+                    <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
+                    <if test="ew.entity.num!=null"> AND NUM=#{ew.entity.num}</if>
+                    <if test="ew.entity.type!=null"> AND TYPE=#{ew.entity.type}</if>
+                    <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </update>
+
+    <delete id="deleteById">
+        DELETE FROM Z_UPLOAD_PICTURES WHERE HANDLE=#{handle}
+    </delete>
+
+    <delete id="deleteByMap">
+        DELETE FROM Z_UPLOAD_PICTURES
+        <if test="cm!=null and !cm.isEmpty">
+            <where>
+                <foreach collection="cm.keys" item="k" separator="AND">
+                    <if test="cm[k] != null">
+                        ${k} = #{cm[${k}]}
+                    </if>
+                </foreach>
+            </where>
+        </if>
+    </delete>
+
+    <delete id="delete">
+        DELETE FROM Z_UPLOAD_PICTURES
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.picturePath!=null"> AND PICTURE_PATH=#{ew.entity.picturePath}</if>
+                    <if test="ew.entity.pictureAddress!=null"> AND PICTURE_ADDRESS=#{ew.entity.pictureAddress}</if>
+                    <if test="ew.entity.objectBo!=null"> AND OBJECT_BO=#{ew.entity.objectBo}</if>
+                    <if test="ew.entity.num!=null"> AND NUM=#{ew.entity.num}</if>
+                    <if test="ew.entity.type!=null"> AND TYPE=#{ew.entity.type}</if>
+                    <if test="ew.entity.createdUser!=null"> AND CREATED_USER=#{ew.entity.createdUser}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifiedUser!=null"> AND MODIFIED_USER=#{ew.entity.modifiedUser}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </delete>
+
+    <delete id="deleteBatchIds">
+        DELETE FROM Z_UPLOAD_PICTURES WHERE HANDLE IN (
+        <foreach item="item" index="index" collection="coll" separator=",">#{item}
+        </foreach>)
+    </delete>
+    <!-- BaseMapper标准查询/修改/删除 -->
+
+</mapper>

common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java

@@ -32,6 +32,11 @@ public interface Constants {
 
     String SITE_ADMIN = "SITE_ADMIN";
 
+    //上料
+    String ACTION_CODE_LOAD="1";
+    //卸料
+    String ACTION_CODE_UNLOAD="2";
+
     //--------------------检验项目|任务-----------------------------------------------------------------------------------
     // 新建
     String INSPECTION_TASK_STATUS_NEW="NEW";

common/src/main/java/com/foreverwin/mesnac/common/constant/DataImportConstant.java

@@ -82,4 +82,16 @@ public interface DataImportConstant {
 
     String SHOP_ORDER_CUSTOM_FIELD_DISPATCHING_STATUS_Y = "Y";
 
+    //不合格数据类型
+    String NC_CODE_DATA_TYPE_SIMPLE = "简单";
+    String NC_CODE_DATA_TYPE_COMMENT = "输入注释";
+    String NC_CODE_DATA_TYPE_COMPONENT = "组件";
+    String NC_CODE_DATA_TYPE_INFO = "信息";
+    String NC_CODE_DATA_TYPE_MESSAGE = "信息";
+    String NC_CODE_DATA_TYPE_NONE = "无";
+
+    //不合格类别
+    String NC_CODE_CATEGORY_FAILURE = "故障";
+    String NC_CODE_CATEGORY_DEFECT = "缺陷";
+    String NC_CODE_CATEGORY_REPAIR = "修复";
 }

common/src/main/java/com/foreverwin/mesnac/common/constant/IntegrationTypeConstant.java

@@ -1,5 +1,12 @@
 package com.foreverwin.mesnac.common.constant;
 
+/**
+ * 外部系统交互接口类型
+ *
+ *
+ * @author Leon
+ * @date 2021/7/8
+ */
 public class IntegrationTypeConstant {
 
     public static final String ITEM = "ITEM";

common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java

@@ -13,7 +13,7 @@ import java.util.Date;
  * @author Leon
  * @date 2021-06-24
  */
-public class SfcDispatchDto implements Serializable {
+public class SfcDispatchDto implements Serializable{
 
     /**
      * 主键

common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java

@@ -126,6 +126,9 @@ public enum HandleEnum {
     /**检验任务明细**/
     INSPECTION_TASK_DETAIL("InspectionTaskDetailBO:","InspectionTaskDetailBO:{0},{1}"),
 
+    /**上料**/
+    LOAD_INVENTORY("LoadInventoryBO:","LoadInventoryBO:{0},{1}"),
+
     /**用户**/
     USR("UserBO","UserBO:{0},{1}");
 

common/src/main/java/com/foreverwin/mesnac/common/service/CommonService.java

@@ -2,6 +2,8 @@ package com.foreverwin.mesnac.common.service;
 
 import com.foreverwin.mesnac.meapi.model.Operation;
 
+import java.math.BigDecimal;
+
 public interface CommonService {
     /**
      * 根据资源或工作中心查找车间
@@ -16,4 +18,6 @@ public interface CommonService {
      * @return
      */
     Operation getOperationBySfcBo(String sfcBo);
+
+    void updateInventory(String site, String inventoryId, BigDecimal measuredQty);
 }

common/src/main/java/com/foreverwin/mesnac/common/service/SfcDispatchCommonService.java

@@ -1,5 +1,7 @@
 package com.foreverwin.mesnac.common.service;
 
+import com.foreverwin.mesnac.common.dto.SfcDispatchDto;
+
 /**
  * 派工公用接口
  *
@@ -18,4 +20,11 @@ public interface SfcDispatchCommonService {
      * @param dispatchStatus
      */
     void updateSfcDispatchStatus(String site, String user, String dispatchNo, String dispatchStatus);
+
+    /**
+     * 根据sfc查询设备
+     * @param sfcDispatch
+     * @return
+     */
+    SfcDispatchDto findResrceBySfc(SfcDispatchDto sfcDispatch);
 }

common/src/main/java/com/foreverwin/mesnac/common/service/impl/CommonServiceImpl.java

@@ -3,6 +3,7 @@ package com.foreverwin.mesnac.common.service.impl;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.foreverwin.mesnac.common.service.CommonService;
+import com.foreverwin.mesnac.common.util.ExceptionUtil;
 import com.foreverwin.mesnac.common.util.StringUtil;
 import com.foreverwin.mesnac.meapi.mapper.OperationMapper;
 import com.foreverwin.mesnac.meapi.model.Operation;
@@ -11,11 +12,17 @@ import com.foreverwin.mesnac.meapi.model.WorkCenterMember;
 import com.foreverwin.mesnac.meapi.service.WorkCenterMemberService;
 import com.foreverwin.mesnac.meapi.service.WorkCenterService;
 import com.foreverwin.modular.core.exception.BusinessException;
+import com.foreverwin.modular.core.meext.MEServices;
+import com.sap.me.inventory.InventoryIdentifier;
+import com.sap.me.inventory.InventoryServiceInterface;
+import com.sap.me.inventory.InventoryStatusEnum;
+import com.sap.me.inventory.InventoryValidateAndUpdateRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.List;
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -59,4 +66,34 @@ public class CommonServiceImpl implements CommonService {
         Operation operation = operationMapper.selectOperationBySfcBo(sfcBo, LocaleContextHolder.getLocale().getLanguage());
         return operation;
     }
+    @Override
+    public void updateInventory(String site, String inventoryId, BigDecimal measuredQty) {
+        try {
+            InventoryServiceInterface inventoryService = MEServices.create("com.sap.me.inventory", "InventoryService", site);
+            com.sap.me.inventory.Inventory inventory = inventoryService.findInventory(new InventoryIdentifier(inventoryId));
+            if (inventory != null) {
+                InventoryValidateAndUpdateRequest updateRequest = new InventoryValidateAndUpdateRequest();
+                updateRequest.setInventoryId(inventory.getInventoryId());
+                updateRequest.setItemRef(inventory.getItemRef());
+                updateRequest.setQuantityOnHand(measuredQty);
+                updateRequest.setStatus(InventoryStatusEnum.AVAILABLE);
+                updateRequest.setAssyDataTypeRef(inventory.getAssyDataTypeRef());
+                updateRequest.setOperationLocationRef(inventory.getOperationLocRef());
+                updateRequest.setOperationLocationReserve(inventory.isOperationLocRes());
+                updateRequest.setShopOrderLocationRef(inventory.getShopOrderLocRef());
+                updateRequest.setShopOrderLocationReserve(inventory.isShopOrderLocRes());
+                updateRequest.setWorkCenterLocationRef(inventory.getWorkCenterLocRef());
+                updateRequest.setWorkCenterLocationReserve(inventory.isWorkCenterLocRes());
+                updateRequest.setResourceLocationRef(inventory.getResourceLocRef());
+                updateRequest.setResourceLocationReserve(inventory.isResourceLocRes());
+                updateRequest.setStorageLocationRef(inventory.getStorageLocationRef());
+                updateRequest.setAssemblyDataList(inventory.getAssemblyDataList());
+                updateRequest.setModifiedDateTime(inventory.getModifiedDateTime());
+                inventoryService.validateAndUpdate(updateRequest);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            ExceptionUtil.throwException(e);
+        }
+    }
 }

common/src/main/resources/mapper/ProdReadyTaskMapper.xml

@@ -640,7 +640,8 @@
         <if test="entity.resrce!=null and entity.resrce!='' "> AND ZPRT.RESRCE=#{entity.resrce}</if>
         <if test="entity.dispatchNo!=null and entity.dispatchNo!='' "> AND ZSD.DISPATCH_NO=#{entity.dispatchNo}</if>
         <if test="entity.status!=null and entity.status!='' "> AND ZPRT.STATUS=#{entity.status}</if>
-        <if test="entity.sfcStepStatus!=null and entity.sfcStepStatus!='' "> AND ZSD.DISPATCH_STATUS=#{entity.sfcStepStatus}</if>
+        <if test="entity.sfcStepStatus!=null and entity.sfcStepStatus!='' and entity.sfcStepStatus=='COMPLETE' "> AND ZSD.DISPATCH_STATUS=#{entity.sfcStepStatus}</if>
+        <if test="entity.sfcStepStatus!=null and entity.sfcStepStatus!='' and entity.sfcStepStatus!='COMPLETE' "> AND ZSD.DISPATCH_STATUS!='COMPLETE'</if>
         <if test="entity.sfc!=null and entity.sfc!='' "> AND ZPRT.SFC=#{entity.sfc}</if>
         <if test="entity.resourceType!=null and entity.resourceType!='' "> AND ZSD.RESOURCE_TYPE=#{entity.resourceType}</if>
         <if test="entity.shopOrder!=null and entity.shopOrder!='' "> AND ZPRT.SHOP_ORDER=#{entity.shopOrder}</if>

console/src/main/resources/application-local.yml

@@ -47,8 +47,15 @@ wechat:
   postUrl: https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=ACCESS_TOKEN
 
 #ftp文档服务器
+#ftp:
+#  host: 10.4.1.53
+#  port:  21
+#  username:
+#  password:
+
 ftp:
-  host: 10.4.1.53
-  port:  21
-  username:
-  password:
+  host: 106.52.244.124
+  port: 21
+  username: zjw
+  password: zhaojiawei
+

dataimport/src/main/java/com/foreverwin/mesnac/dataimport/client/ItemWSClient.java

@@ -9,6 +9,7 @@ import com.sap.me.common.ObjectAliasEnum;
 import com.sap.me.common.ObjectReference;
 import com.sap.me.productdefinition.ItemConfigurationServiceInterface;
 import com.sap.me.productdefinition.ItemFullConfiguration;
+import com.sap.me.productdefinition.QuantityRestriction;
 
 import java.math.BigDecimal;
 
@@ -20,6 +21,12 @@ import java.math.BigDecimal;
  */
 public class ItemWSClient {
 
+    /**
+     * 查询物料
+     *
+     * @param data
+     * @return
+     */
     public static ItemFullConfiguration find(JSONObject data) {
         try {
             String site = (String) data.get("site");
@@ -29,8 +36,8 @@ public class ItemWSClient {
 
             //----------------------------------------------------------------------------------------------------------
             ItemConfigurationServiceInterface itemConfigurationService = MEServices.create("com.sap.me.productdefinition", "ItemConfigurationService", site);
-            ObjectReference request = new ObjectReference(objRef);
-            ItemFullConfiguration op = itemConfigurationService.readItem(request);
+            ObjectReference objectReference = new ObjectReference(objRef);
+            ItemFullConfiguration op = itemConfigurationService.readItem(objectReference);
 
             return op;
         } catch (Exception e) {
@@ -39,6 +46,13 @@ public class ItemWSClient {
         return null;
     }
 
+    /**
+     * 更新物料
+     *
+     * @param jsonObject
+     * @param itemFull
+     * @return
+     */
     public static String update(JSONObject jsonObject, ItemFullConfiguration itemFull) {
         try {
             String site = jsonObject.getString("site");
@@ -49,6 +63,11 @@ public class ItemWSClient {
             //---------------------------------------------------------------------------------------
             ItemConfigurationServiceInterface itemConfigurationService = MEServices.create("com.sap.me.productdefinition", "ItemConfigurationService", site);
             itemFull.setLotSize(new BigDecimal(lotSize));
+            if ("1".equals(lotSize)) {
+                itemFull.setQuantityRestriction(QuantityRestriction.ONLY_1);
+            } else {
+                itemFull.setQuantityRestriction(QuantityRestriction.ANY_NUMBER);
+            }
             itemConfigurationService.updateItem(itemFull);
 
             //自定义字段保存

dataimport/src/main/java/com/foreverwin/mesnac/dataimport/client/NcCodeWSClient.java

@@ -1,15 +1,16 @@
 package com.foreverwin.mesnac.dataimport.client;
 
 import com.alibaba.fastjson.JSONObject;
+import com.foreverwin.mesnac.common.constant.DataImportConstant;
 import com.foreverwin.mesnac.common.enums.HandleEnum;
 import com.foreverwin.mesnac.common.util.ExceptionUtil;
 import com.foreverwin.mesnac.common.util.StringUtil;
 import com.foreverwin.modular.core.meext.MEServices;
 import com.sap.me.common.BasicStatusEnum;
+import com.sap.me.common.ObjectAliasEnum;
 import com.sap.me.common.ObjectReference;
 import com.sap.me.nonconformance.*;
 
-import javax.xml.datatype.DatatypeConstants;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
@@ -83,14 +84,14 @@ public class NcCodeWSClient {
 
             //不合格代码类型
             NCCategory ncCodeCategory = NCCategory.FAILURE;
-            switch (category) {
-                case "故障" :
+            switch (category.trim()) {
+                case DataImportConstant.NC_CODE_CATEGORY_FAILURE :
                     ncCodeCategory = NCCategory.FAILURE;
                     break;
-                case "缺陷" :
+                case DataImportConstant.NC_CODE_CATEGORY_DEFECT :
                     ncCodeCategory = NCCategory.DEFECT;
                     break;
-                case "修复" :
+                case DataImportConstant.NC_CODE_CATEGORY_REPAIR :
                     ncCodeCategory = NCCategory.REPAIR;
                     break;
                     default: break;
@@ -98,7 +99,11 @@ public class NcCodeWSClient {
             ncCodeConfiguration.setNcCategory(ncCodeCategory);
 
             //不合格数据类型
-            dataType = StringUtil.notBlank(dataType) ? dataType : "SIMPLE";
+            if (StringUtil.isBlank(dataType)) {
+                dataType = "SIMPLE";
+            } else if ("SIMPLE".equals(dataType) || DataImportConstant.NC_CODE_DATA_TYPE_SIMPLE.equals(dataType)) {
+                dataType = "SIMPLE";
+            }
             String ncDataTypeRef = HandleEnum.DATA_TYPE.getHandle(site, "NC", dataType);
             ncCodeConfiguration.setNcDataTypeRef(ncDataTypeRef);
 
@@ -115,13 +120,13 @@ public class NcCodeWSClient {
             if (StringUtil.notBlank(secondaryCodes)) {
                 List<NcSecondaryCode> ncSecondaryCodeList = new ArrayList<>();
 
-                if (!secondaryCodes.contains(":")) {
+                if (!secondaryCodes.contains(";")) {
                     NcSecondaryCode ncSecondaryCode = new NcSecondaryCode();
                     String ncCodeRef = HandleEnum.NC_CODE.getHandle(site, secondaryCodes);
                     ncSecondaryCode.setNcCodeRef(ncCodeRef);
                     ncSecondaryCodeList.add(ncSecondaryCode);
                 } else {
-                    String [] secondaryCodeArray = secondaryCodes.split(":");
+                    String [] secondaryCodeArray = secondaryCodes.split(";");
                     for (String secondaryCode: secondaryCodeArray) {
                         NcSecondaryCode ncSecondaryCode = new NcSecondaryCode();
                         String ncCodeRef = HandleEnum.NC_CODE.getHandle(site, secondaryCode);
@@ -141,6 +146,9 @@ public class NcCodeWSClient {
             //------------------------------------------------------------------------------------------------
             NcCodeConfigurationServiceInterface ncCodeConfigurationService = MEServices.create("com.sap.me.nonconformance", "NcCodeConfigurationService", site);
             ncCodeConfigurationService.createNcCode(ncCodeConfiguration);
+
+            //自定义字段保存
+            CustomDataWSClient.update(jsonObject, ncCodeConfiguration.getRef(), ObjectAliasEnum.NC_CODE.value());
         } catch (Exception e) {
             return ExceptionUtil.getExceptionMsg(e);
         }
@@ -173,21 +181,33 @@ public class NcCodeWSClient {
 
             //不合格代码组
             String ncGroup = jsonObject.getString("ncGroup");
-            NcGroupMember ncGroupMember = new NcGroupMember();
             String ncGroupBo = HandleEnum.NC_GROUP.getHandle(site, ncGroup);
-            ncGroupMember.setNcGroupRef(ncGroupBo);
-            ncCodeFullConfiguration.getNcGroupMemberList().add(ncGroupMember);
+            List<NcGroupMember> ncGroupMemberList = ncCodeFullConfiguration.getNcGroupMemberList();
+            if (ncGroupMemberList == null || ncGroupMemberList.size() <= 0) {
+                NcGroupMember ncGroupMember = new NcGroupMember();
+                ncGroupMember.setNcGroupRef(ncGroupBo);
+                ncCodeFullConfiguration.getNcGroupMemberList().add(ncGroupMember);
+            } else {
+                for (NcGroupMember ncGroupMemberModel : ncGroupMemberList) {
+                    if (!ncGroupBo.equals(ncGroupMemberModel.getNcGroupRef())) {
+                        NcGroupMember ncGroupMember = new NcGroupMember();
+                        ncGroupMember.setNcGroupRef(ncGroupBo);
+                        ncCodeFullConfiguration.getNcGroupMemberList().add(ncGroupMember);
+                    }
+                }
+            }
+
 
             //不合格代码类型
             NCCategory ncCodeCategory = NCCategory.FAILURE;
-            switch (category) {
-                case "故障" :
+            switch (category.trim()) {
+                case DataImportConstant.NC_CODE_CATEGORY_FAILURE :
                     ncCodeCategory = NCCategory.FAILURE;
                     break;
-                case "缺陷" :
+                case DataImportConstant.NC_CODE_CATEGORY_DEFECT :
                     ncCodeCategory = NCCategory.DEFECT;
                     break;
-                case "修复" :
+                case DataImportConstant.NC_CODE_CATEGORY_REPAIR :
                     ncCodeCategory = NCCategory.REPAIR;
                     break;
                 default: break;
@@ -195,7 +215,11 @@ public class NcCodeWSClient {
             ncCodeFullConfiguration.setNcCategory(ncCodeCategory);
 
             //不合格数据类型
-            dataType = StringUtil.notBlank(dataType) ? dataType : "SIMPLE";
+            if (StringUtil.isBlank(dataType)) {
+                dataType = "SIMPLE";
+            } else if ("SIMPLE".equals(dataType) || DataImportConstant.NC_CODE_DATA_TYPE_SIMPLE.equals(dataType)) {
+                dataType = "SIMPLE";
+            }
             String ncDataTypeRef = HandleEnum.DATA_TYPE.getHandle(site, "NC", dataType);
             ncCodeFullConfiguration.setNcDataTypeRef(ncDataTypeRef);
 
@@ -212,13 +236,13 @@ public class NcCodeWSClient {
             if (StringUtil.notBlank(secondaryCodes)) {
                 List<NcSecondaryCode> ncSecondaryCodeList = new ArrayList<>();
 
-                if (!secondaryCodes.contains(":")) {
+                if (!secondaryCodes.contains(";")) {
                     NcSecondaryCode ncSecondaryCode = new NcSecondaryCode();
                     String ncCodeRef = HandleEnum.NC_CODE.getHandle(site, secondaryCodes);
                     ncSecondaryCode.setNcCodeRef(ncCodeRef);
                     ncSecondaryCodeList.add(ncSecondaryCode);
                 } else {
-                    String [] secondaryCodeArray = secondaryCodes.split(":");
+                    String [] secondaryCodeArray = secondaryCodes.split(";");
                     for (String secondaryCode: secondaryCodeArray) {
                         NcSecondaryCode ncSecondaryCode = new NcSecondaryCode();
                         String ncCodeRef = HandleEnum.NC_CODE.getHandle(site, secondaryCode);
@@ -238,6 +262,9 @@ public class NcCodeWSClient {
             //------------------------------------------------------------------------------------------------
             NcCodeConfigurationServiceInterface ncCodeConfigurationService = MEServices.create("com.sap.me.nonconformance", "NcCodeConfigurationService", site);
             ncCodeConfigurationService.updateNcCode(ncCodeFullConfiguration);
+
+            //自定义字段保存
+            CustomDataWSClient.update(jsonObject, ncCodeFullConfiguration.getRef(), ObjectAliasEnum.NC_CODE.value());
         } catch (Exception e) {
             return ExceptionUtil.getExceptionMsg(e);
         }

dataimport/src/main/java/com/foreverwin/mesnac/dataimport/client/NcGroupWSClient.java

@@ -39,7 +39,6 @@ public class NcGroupWSClient {
             ObjectReference objectReference = new ObjectReference(ncGroupBo);
             ncGroupFullConfiguration = ncGroupConfigurationService.readNcGroup(objectReference);
         } catch (Exception e) {
-            //-------------------
         }
 
         return ncGroupFullConfiguration;
@@ -66,9 +65,10 @@ public class NcGroupWSClient {
             ncGroupFullConfiguration.setRef(ncGroupBo);
             ncGroupFullConfiguration.setNcGroup(ncGroup);
             ncGroupFullConfiguration.setDescription(description);
-            if ("true".equals(applyAll)) {
+            if ("true".equals(applyAll) || "是".equals(applyAll)) {
                 ncGroupFullConfiguration.setValidAtAllOperations(true);
             } else {
+                ncGroupFullConfiguration.setValidAtAllOperations(false);
                 if (StringUtil.notBlank(applyOperation) && applyOperation.contains(";")) {
                     List<NcGroupValidOperation> list = new ArrayList<>();
                     String[] operationList = applyOperation.split(";");
@@ -95,10 +95,10 @@ public class NcGroupWSClient {
      * 不良代码组更新
      *
      * @param jsonObject
-     * @param ncGroupFull
+     * @param ncGroupFullConfiguration
      * @return
      */
-    public static String update(JSONObject jsonObject, NcGroupFullConfiguration ncGroupFull) {
+    public static String update(JSONObject jsonObject, NcGroupFullConfiguration ncGroupFullConfiguration) {
         try {
             String site = jsonObject.getString("site");
             String description = jsonObject.getString("description");
@@ -107,10 +107,11 @@ public class NcGroupWSClient {
 
             //---------------------------------------------------------------------------------------------------
             NcGroupConfigurationServiceInterface ncGroupConfigurationService = MEServices.create("com.sap.me.nonconformance", "NcGroupConfigurationService", site);
-            ncGroupFull.setDescription(description);
-            if ("true".equals(applyAll)) {
-                ncGroupFull.setValidAtAllOperations(true);
+            ncGroupFullConfiguration.setDescription(description);
+            if ("true".equals(applyAll) || "是".equals(applyAll)) {
+                ncGroupFullConfiguration.setValidAtAllOperations(true);
             } else {
+                ncGroupFullConfiguration.setValidAtAllOperations(false);
                 if (StringUtil.notBlank(applyOperation) && applyOperation.contains(";")) {
                     List<NcGroupValidOperation> list = new ArrayList<>();
                     String[] operationList = applyOperation.split(";");
@@ -121,11 +122,11 @@ public class NcGroupWSClient {
                         list.add(ncGroupValidOperation);
                     }
 
-                    ncGroupFull.setNcGroupValidOperationList(list);
+                    ncGroupFullConfiguration.setNcGroupValidOperationList(list);
                 }
             }
 
-            ncGroupConfigurationService.updateNcGroup(ncGroupFull);
+            ncGroupConfigurationService.updateNcGroup(ncGroupFullConfiguration);
         } catch (Exception e) {
             return ExceptionUtil.getExceptionMsg(e);
         }

dataimport/src/main/java/com/foreverwin/mesnac/dataimport/handler/ItemHandler.java

@@ -63,9 +63,11 @@ public class ItemHandler extends BaseHandler {
                         ItemFullConfiguration itemFull = ItemWSClient.find(jsonObject);
                         if (itemFull == null) {
                             resultMessage = "物料主数据不存在";
+                        } else {
+                            ItemWSClient.update(jsonObject, itemFull);
+                            return 1;
                         }
 
-                        ItemWSClient.update(jsonObject, itemFull);
                         if (resultMessage != null) {
                             params[2] = resultMessage;
                             failedNumber[0]++;
@@ -73,6 +75,7 @@ public class ItemHandler extends BaseHandler {
                             return 0;
                         }
                     }
+
                     return 0;
                 } catch (Exception e) {
                     params[2] = e.getMessage();

dataimport/src/main/java/com/foreverwin/mesnac/dataimport/handler/NCCodeHandler.java

@@ -1,7 +1,6 @@
 package com.foreverwin.mesnac.dataimport.handler;
 
 import com.alibaba.fastjson.JSONObject;
-import com.foreverwin.mesnac.dataimport.client.ItemWSClient;
 import com.foreverwin.mesnac.dataimport.client.NcCodeWSClient;
 import com.foreverwin.mesnac.dataimport.client.NcGroupWSClient;
 import com.foreverwin.mesnac.dataimport.handler.base.BaseHandler;
@@ -14,8 +13,6 @@ import com.foreverwin.modular.core.exception.BusinessException;
 import com.foreverwin.modular.core.util.I18nUtil;
 import com.sap.me.common.ObjectAliasEnum;
 import com.sap.me.nonconformance.NcCodeFullConfiguration;
-import com.sap.me.nonconformance.NcGroupFullConfiguration;
-import com.sap.me.productdefinition.ItemFullConfiguration;
 
 import java.io.InputStream;
 import java.util.Map;
@@ -68,16 +65,22 @@ public class NCCodeHandler extends BaseHandler {
                     if (jsonObject.containsKey("ncGroup") && jsonObject.getString("ncGroup").trim().length() > 0) {
                         jsonObject.put("site", site);
                         NcCodeFullConfiguration ncCodeFull = NcCodeWSClient.find(jsonObject);
-                        if (ncCodeFull == null) {
-                            if (AppUtil.canInsert(mode)) {
-                                insert = true;
-                                NcGroupWSClient.create(jsonObject);
-                            }else if(AppUtil.canUpdate(mode)) {
-                                resultMessage = ("第" + index + "行：" + I18nUtil.getI18nText("MaterData.import.update.fail", params) + "\n");
+                        if (ncCodeFull != null) {
+                            if (AppUtil.canUpdate(mode)) {
+                                resultMessage = NcCodeWSClient.update(jsonObject, ncCodeFull);
+                                if (resultMessage == null) {
+                                    return 1;
+                                }
                             }
                         } else {
-                            if (AppUtil.canUpdate(mode)) {
-                                NcCodeWSClient.update(jsonObject, ncCodeFull);
+                            if (AppUtil.canInsert(mode)) {
+                                insert = true;
+                                resultMessage = NcCodeWSClient.create(jsonObject);
+                                if (resultMessage == null) {
+                                    return 1;
+                                }
+                            } else if(AppUtil.canUpdate(mode)) {
+                                resultMessage = ("更新的不合格代码不存在" + "\n");
                             }
                         }
 

dataimport/src/main/java/com/foreverwin/mesnac/dataimport/handler/NCGroupHandler.java

@@ -61,16 +61,21 @@ public class NCGroupHandler extends BaseHandler {
                     if (jsonObject.containsKey("ncGroup") && jsonObject.getString("ncGroup").trim().length() > 0) {
                         jsonObject.put("site", site);
                         NcGroupFullConfiguration ncGroupFull = NcGroupWSClient.find(jsonObject);
-                        if (ncGroupFull == null) {
-                            if (AppUtil.canInsert(mode)) {
-                                insert = true;
-                                NcGroupWSClient.create(jsonObject);
-                            }else if(AppUtil.canUpdate(mode)) {
-                                resultMessage = ("第" + index + "行：" + I18nUtil.getI18nText("MaterData.import.update.fail", params) + "\n");
+                        if (ncGroupFull != null) {
+                            if (AppUtil.canUpdate(mode)) {
+                                resultMessage = NcGroupWSClient.update(jsonObject, ncGroupFull);
+                                if (resultMessage == null) {
+                                    return 1;
+                                }
                             }
                         } else {
-                            if (AppUtil.canUpdate(mode)) {
-                                NcGroupWSClient.update(jsonObject, ncGroupFull);
+                            if (AppUtil.canInsert(mode)) {
+                                resultMessage = NcGroupWSClient.create(jsonObject);
+                                if (resultMessage == null) {
+                                    return 1;
+                                }
+                            } else if(AppUtil.canUpdate(mode)) {
+                                resultMessage = ("更新的不合格组不存在" + "\n");
                             }
                         }
 

dataimport/src/main/java/com/foreverwin/mesnac/dataimport/handler/OperationHandler.java

@@ -80,6 +80,7 @@ public class OperationHandler extends BaseHandler {
                                 resultMessage ="第" + index + "行：" + I18nUtil.getI18nText("MaterData.import.upDateObjectNotExist") + "\n";
                             }
                         }
+
                         if (resultMessage != null) {
                             params[2] = resultMessage;
                             failedNumber[0]++;

dataimport/src/main/java/com/foreverwin/mesnac/dataimport/handler/ResourceTypeHandler.java

@@ -62,7 +62,10 @@ public class ResourceTypeHandler extends BaseHandler {
                         if (collection.size() > 0) {
                             resultMessage = "资源类型主数据已经存在";
                         } else {
-                            ResourceTypeWSClient.insert(jsonObject);
+                            resultMessage = ResourceTypeWSClient.insert(jsonObject);
+                            if (resultMessage == null) {
+                                return 1;
+                            }
                         }
 
                         if (resultMessage != null) {

dataimport/src/main/java/com/foreverwin/mesnac/dataimport/handler/WorkCenterHandler.java

@@ -60,8 +60,9 @@ public class WorkCenterHandler extends BaseHandler {
                 try {
                     if (jsonObject.containsKey("workCenter") && jsonObject.getString("workCenter").trim().length() > 0) {
                         jsonObject.put("site", site);
-                        WorkCenterFullConfiguration result = WorkCenterWSClient.find(jsonObject);
+
                         String resultMessage = null;
+                        WorkCenterFullConfiguration result = WorkCenterWSClient.find(jsonObject);
                         if (result != null && result.getWorkCenter() != null && result.getWorkCenter().length() > 0) {
                             if (AppUtil.canUpdate(mode)) {
                                 resultMessage = WorkCenterWSClient.update(jsonObject, result);
@@ -80,6 +81,7 @@ public class WorkCenterHandler extends BaseHandler {
                                 resultMessage = "第" +index+ "行:" + I18nUtil.getI18nText("MaterData.import.upDateObjectNotExist") + "\n";
                             }
                         }
+
                         if (resultMessage != null) {
                             params[2] = resultMessage;
                             failedNumber[0]++;
@@ -91,6 +93,7 @@ public class WorkCenterHandler extends BaseHandler {
                         }
                     }
                     return 0;
+
                 } catch (Exception e) {
                     params[2] = e.getMessage();
                     failedNumber[0]++;

dataimport/src/main/java/com/foreverwin/mesnac/dataimport/service/MasterObjectDefine.java

@@ -22,8 +22,6 @@ public class MasterObjectDefine {
 				cvsHeadsMapping.put("seqNum","序号");
 				cvsHeadsMapping.put("item","物料编码");
 				cvsHeadsMapping.put("lotSize","批次大小");
-				cvsHeadsMapping.put("perMeter","自定义-PER_METER");
-				cvsHeadsMapping.put("perSquareMeter","自定义-PER_SQUARE_METER");
 
 				break;
 

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/CallItemController.java

@@ -1,17 +1,18 @@
 package com.foreverwin.mesnac.dispatch.controller;
 
+import com.foreverwin.mesnac.common.util.StringUtil;
+import com.foreverwin.mesnac.dispatch.dto.IssueItemDto;
 import com.foreverwin.modular.core.exception.BusinessException;
 import com.foreverwin.modular.core.util.R;
-import com.foreverwin.modular.core.util.FrontPage;
 import com.foreverwin.modular.core.util.CommonMethods;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import com.foreverwin.mesnac.dispatch.service.CallItemService;
 import com.foreverwin.mesnac.dispatch.model.CallItem;
+
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -28,7 +29,7 @@ public class CallItemController {
 
 
     /**
-     * 查询所有数据
+     * 查询叫料数据
      *
      * @return
      */
@@ -47,6 +48,45 @@ public class CallItemController {
         return R.ok(result);
     }
 
+    /**
+     * 查询叫料明细数据
+     *
+     * @return
+     */
+    @ResponseBody
+    @PostMapping("/findCallItemDetailList")
+    public R findCallItemDetailList(@RequestBody CallItem callItem){
+        List<CallItem> result;
+        try {
+            callItem.setSite(CommonMethods.getSite());
+            result = callItemService.findCallItemDetailList(callItem);
+        } catch (Exception e) {
+            return R.failed(e.getMessage());
+        }
+
+
+        return R.ok(result);
+    }
+
+    /**
+     * 查询叫料明细数据
+     *
+     * @return
+     */
+    @ResponseBody
+    @PostMapping("/findCallItemDetailListByDispatchBo")
+    public R findCallItemDetailListByDispatchBo(@RequestBody  List<String> dispatchBoList){
+        List<CallItem> result;
+        try {
+            String site = CommonMethods.getSite();
+            result = callItemService.findCallItemDetailListByDispatchBo(site, dispatchBoList);
+        } catch (Exception e) {
+            return R.failed(e.getMessage());
+        }
+
+
+        return R.ok(result);
+    }
 
     @ResponseBody
     @PostMapping("/callItem")
@@ -82,4 +122,69 @@ public class CallItemController {
 
         return R.ok("确认到料操作成功");
     }
+
+    @ResponseBody
+    @PostMapping("/cancelCallItem")
+    public R cancelCallItem(@RequestBody List<String> callItemNoList) {
+        try {
+            String site = CommonMethods.getSite();
+            String user = CommonMethods.getUser();
+            if (callItemNoList == null || callItemNoList.size() <= 0) {
+                throw BusinessException.build("请至少选择一笔记录");
+            }
+            callItemService.cancelCallItem(site, user, callItemNoList);
+        } catch (Exception e) {
+            return R.failed(e.getMessage());
+        }
+
+        return R.ok("取消叫料成功");
+    }
+
+    @ResponseBody
+    @PostMapping("/refreshRequiredTime")
+    public R refreshRequiredTime(@RequestBody List<String> callItemNoList) {
+        try {
+            String site = CommonMethods.getSite();
+            String user = CommonMethods.getUser();
+            if (callItemNoList == null || callItemNoList.size() <= 0) {
+                throw BusinessException.build("请至少选择一笔记录");
+            }
+            callItemService.refreshRequiredTime(site, user, callItemNoList);
+        } catch (Exception e) {
+            return R.failed(e.getMessage());
+        }
+
+        return R.ok("刷新需求时间成功");
+    }
+
+
+    @ResponseBody
+    @GetMapping("/findIssueItemList")
+    public R findIssueItemList(String workCenter, String resource, String shopOrder, String dispatchNo, String requiredFromDate, String requiredToDate, Boolean matchResource) {
+        List<CallItem> result;
+        try {
+            String site = CommonMethods.getSite();
+
+            //参数拼装
+            IssueItemDto issueItemDto = new IssueItemDto();
+            issueItemDto.setSite(site);
+            issueItemDto.setResource(resource);
+            issueItemDto.setWorkCenter(workCenter);
+            issueItemDto.setShopOrder(shopOrder);
+            issueItemDto.setDispatchNo(dispatchNo);
+            issueItemDto.setMatchResource(matchResource);
+            if (StringUtil.notBlank(requiredFromDate)) {
+                issueItemDto.setRequiredFromDT(LocalDateTime.parse(requiredFromDate));
+            }
+            if (StringUtil.notBlank(requiredToDate)) {
+                issueItemDto.setRequiredToDT(LocalDateTime.parse(requiredToDate));
+            }
+
+            result = callItemService.findIssueItemList(issueItemDto);
+        } catch (Exception e) {
+            return R.failed(e.getMessage());
+        }
+
+        return R.ok(result);
+    }
 }

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/IssueItemController.java

@@ -0,0 +1,40 @@
+package com.foreverwin.mesnac.dispatch.controller;
+
+import com.foreverwin.modular.core.util.R;
+import com.foreverwin.modular.core.util.FrontPage;
+import com.foreverwin.modular.core.util.CommonMethods;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import com.foreverwin.mesnac.dispatch.service.IssueItemService;
+import com.foreverwin.mesnac.dispatch.model.IssueItem;
+import java.util.List;
+
+/**
+ *
+ * @author Leon.L
+ * @since 2021-07-09
+ */
+@RestController
+@RequestMapping("/Z-ISSUE-ITEM")
+public class IssueItemController {
+
+    @Autowired
+    public IssueItemService issueItemService;
+
+    @ResponseBody
+    @GetMapping("/scanIssueInventory")
+    public R scanIssueInventory(String item, String inventory){
+        try {
+            String site = CommonMethods.getSite();
+            issueItemService.scanIssueInventory(site, item, inventory);
+        } catch (Exception e) {
+            return R.failed(e.getMessage());
+        }
+
+        return R.ok();
+    }
+}

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SurplusItemReturnController.java

@@ -0,0 +1,51 @@
+package com.foreverwin.mesnac.dispatch.controller;
+
+import com.foreverwin.mesnac.common.util.StringUtil;
+import com.foreverwin.modular.core.exception.BusinessException;
+import com.foreverwin.modular.core.util.R;
+import com.foreverwin.modular.core.util.FrontPage;
+import com.foreverwin.modular.core.util.CommonMethods;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import com.foreverwin.mesnac.dispatch.service.SurplusItemReturnService;
+import com.foreverwin.mesnac.dispatch.model.SurplusItemReturn;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * @author Leon.L
+ * @since 2021-07-10
+ */
+@RestController
+@RequestMapping("/Z-SURPLUS-ITEM-RETURN")
+public class SurplusItemReturnController {
+
+    @Autowired
+    public SurplusItemReturnService surplusItemReturnService;
+
+
+    @ResponseBody
+    @GetMapping("/{inventory:.+}")
+    public R getInventoryData(@PathVariable String inventory) {
+        Map<String, Object> result;
+
+        try {
+            if (StringUtil.isBlank(inventory)) {
+                throw BusinessException.build("物料条码不能为空！");
+            }
+
+            String site = CommonMethods.getSite();
+            result = surplusItemReturnService.getInventoryData(site, inventory);
+        } catch (Exception e) {
+            return R.failed(e.getMessage());
+        }
+
+        return R.ok(result);
+    }
+
+}

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/dto/IssueItemDto.java

@@ -0,0 +1,80 @@
+package com.foreverwin.mesnac.dispatch.dto;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+public class IssueItemDto implements Serializable {
+
+    private String site;
+    private String resource;
+    private String workCenter;
+    private String shopOrder;
+    private String dispatchNo;
+    private Boolean matchResource;
+    private LocalDateTime requiredFromDT;
+    private LocalDateTime requiredToDT;
+
+    public String getSite() {
+        return site;
+    }
+
+    public void setSite(String site) {
+        this.site = site;
+    }
+
+    public String getResource() {
+        return resource;
+    }
+
+    public void setResource(String resource) {
+        this.resource = resource;
+    }
+
+    public String getWorkCenter() {
+        return workCenter;
+    }
+
+    public void setWorkCenter(String workCenter) {
+        this.workCenter = workCenter;
+    }
+
+    public String getShopOrder() {
+        return shopOrder;
+    }
+
+    public void setShopOrder(String shopOrder) {
+        this.shopOrder = shopOrder;
+    }
+
+    public String getDispatchNo() {
+        return dispatchNo;
+    }
+
+    public void setDispatchNo(String dispatchNo) {
+        this.dispatchNo = dispatchNo;
+    }
+
+    public Boolean getMatchResource() {
+        return matchResource;
+    }
+
+    public void setMatchResource(Boolean matchResource) {
+        this.matchResource = matchResource;
+    }
+
+    public LocalDateTime getRequiredFromDT() {
+        return requiredFromDT;
+    }
+
+    public void setRequiredFromDT(LocalDateTime requiredFromDT) {
+        this.requiredFromDT = requiredFromDT;
+    }
+
+    public LocalDateTime getRequiredToDT() {
+        return requiredToDT;
+    }
+
+    public void setRequiredToDT(LocalDateTime requiredToDT) {
+        this.requiredToDT = requiredToDT;
+    }
+}

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/CallItemMapper.java

@@ -1,6 +1,7 @@
 package com.foreverwin.mesnac.dispatch.mapper;
 
 import com.foreverwin.mesnac.common.dto.SfcDispatchDto;
+import com.foreverwin.mesnac.dispatch.dto.IssueItemDto;
 import com.foreverwin.mesnac.dispatch.model.CallItem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mesnac.dispatch.model.SfcDispatch;
@@ -51,6 +52,33 @@ public interface CallItemMapper extends BaseMapper<CallItem> {
      */
     List<CallItem> findCallItemList(CallItem callItem);
 
+    /**
+     * 查询叫料明细
+     *
+     * @param callItem
+     * @return
+     */
+    List<CallItem> findCallItemDetailList(CallItem callItem);
+
+    /**
+     * 查询叫料明细
+     *
+     * @param site
+     * @param list
+     * @return
+     */
+    List<CallItem> findCallItemDetailListByDispatchBo(@Param("site") String site, @Param("list") List<String> list);
+
+    /**
+     * 修改叫料数据状态
+     *
+     * @param status
+     * @param user
+     * @param dateTime
+     * @param list
+     */
+    void updateCallItemStatusByDispatchBo(@Param("status") String status, @Param("user") String user, @Param("dateTime") LocalDateTime dateTime, @Param("list") List<CallItem> list);
+
     /**
      * 修改叫料数据状态
      *
@@ -59,5 +87,22 @@ public interface CallItemMapper extends BaseMapper<CallItem> {
      * @param dateTime
      * @param list
      */
-    void updateCallItemStatus(@Param("status") String status, @Param("user") String user, @Param("dateTime") LocalDateTime dateTime, @Param("list") List<CallItem> list);
+    void updateCallItemStatusByCallItemNo(@Param("status") String status, @Param("user") String user, @Param("dateTime") LocalDateTime dateTime, @Param("list") List<String> list);
+
+    /**
+     * 刷新叫料时间
+     *
+     * @param user
+     * @param dateTime
+     * @param list
+     */
+    void refreshRequiredTime(@Param("user") String user, @Param("dateTime") LocalDateTime dateTime, @Param("list") List<String> list);
+
+
+
+
+    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    //车间发料查询
+    List<CallItem> finsIssueItemListToResource(IssueItemDto issueItemDto);
+    List<CallItem> finsIssueItemListNoResource(IssueItemDto issueItemDto);
 }

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/IssueItemMapper.java

@@ -0,0 +1,18 @@
+package com.foreverwin.mesnac.dispatch.mapper;
+
+import com.foreverwin.mesnac.dispatch.model.IssueItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 车间发料 Mapper 接口
+ * </p>
+ *
+ * @author Leon.L
+ * @since 2021-07-09
+ */
+@Repository
+public interface IssueItemMapper extends BaseMapper<IssueItem> {
+
+}

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java

@@ -1,5 +1,6 @@
 package com.foreverwin.mesnac.dispatch.mapper;
 
+import com.foreverwin.mesnac.common.dto.SfcDispatchDto;
 import com.foreverwin.mesnac.dispatch.model.SfcDispatch;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.foreverwin.mesnac.dispatch.model.ShopOrderRelease;
@@ -38,4 +39,6 @@ public interface SfcDispatchMapper extends BaseMapper<SfcDispatch> {
                                  @Param("dispatchStatus") String dispatchStatus,
                                  @Param("modifyUser") String modifyUser,
                                  @Param("modifiedDateTime") LocalDateTime modifiedDateTime);
+
+    SfcDispatchDto findResrceBySfc(@Param("sfcDispatch")SfcDispatchDto sfcDispatch, @Param("site") String site, @Param("array") String[] array);
 }

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SurplusItemReturnMapper.java

@@ -0,0 +1,28 @@
+package com.foreverwin.mesnac.dispatch.mapper;
+
+import com.foreverwin.mesnac.dispatch.model.SurplusItemReturn;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 余料退回 Mapper 接口
+ * </p>
+ *
+ * @author Leon.L
+ * @since 2021-07-10
+ */
+@Repository
+public interface SurplusItemReturnMapper extends BaseMapper<SurplusItemReturn> {
+
+    /**
+     * 查询库存信息
+     *
+     * @param inventoryBo
+     * @return
+     */
+    Map<String, Object> selectInventoryData(@Param("inventoryBo") String inventoryBo);
+}

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/CallItem.java

@@ -136,12 +136,18 @@ public class CallItem extends Model<CallItem> {
    @TableField(exist = false)
    private String item;
    @TableField(exist = false)
+   private String component;
+   @TableField(exist = false)
    private String itemDescription;
    @TableField(exist = false)
    private String materialType;
    @TableField(exist = false)
    private String dispatchStatus;
    @TableField(exist = false)
+   private String employee;
+   @TableField(exist = false)
+   private String sourceResource;
+   @TableField(exist = false)
    private String workOrder;
    @TableField(exist = false)
    private String workCenter;
@@ -160,7 +166,6 @@ public class CallItem extends Model<CallItem> {
    @TableField(exist = false)
    private String remark;
 
-
    public String getHandle() {
       return handle;
    }
@@ -177,6 +182,14 @@ public class CallItem extends Model<CallItem> {
       this.site = site;
    }
 
+   public String getSfcDispatchBo() {
+      return sfcDispatchBo;
+   }
+
+   public void setSfcDispatchBo(String sfcDispatchBo) {
+      this.sfcDispatchBo = sfcDispatchBo;
+   }
+
    public String getCallItemNo() {
       return callItemNo;
    }
@@ -201,14 +214,6 @@ public class CallItem extends Model<CallItem> {
       this.sfc = sfc;
    }
 
-   public String getSfcDispatchBo() {
-      return sfcDispatchBo;
-   }
-
-   public void setSfcDispatchBo(String sfcDispatchBo) {
-      this.sfcDispatchBo = sfcDispatchBo;
-   }
-
    public String getOperation() {
       return operation;
    }
@@ -337,6 +342,14 @@ public class CallItem extends Model<CallItem> {
       this.item = item;
    }
 
+   public String getComponent() {
+      return component;
+   }
+
+   public void setComponent(String component) {
+      this.component = component;
+   }
+
    public String getItemDescription() {
       return itemDescription;
    }
@@ -361,6 +374,22 @@ public class CallItem extends Model<CallItem> {
       this.dispatchStatus = dispatchStatus;
    }
 
+   public String getEmployee() {
+      return employee;
+   }
+
+   public void setEmployee(String employee) {
+      this.employee = employee;
+   }
+
+   public String getSourceResource() {
+      return sourceResource;
+   }
+
+   public void setSourceResource(String sourceResource) {
+      this.sourceResource = sourceResource;
+   }
+
    public String getWorkOrder() {
       return workOrder;
    }

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/IssueItem.java

@@ -0,0 +1,232 @@
+package com.foreverwin.mesnac.dispatch.model;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+
+/**
+ * <p>
+ * 车间发料
+ * </p>
+ *
+ * @author Leon.L
+ * @since 2021-07-09
+ */
+
+@TableName("Z_ISSUE_ITEM")
+
+public class IssueItem extends Model<IssueItem> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+   @TableField("HANDLE")
+   private String handle;
+    /**
+     * 站点
+     */
+   @TableField("SITE")
+   private String site;
+    /**
+     * 叫料单号
+     */
+   @TableField("CALL_ITEM_NO")
+   private String callItemNo;
+    /**
+     * 生产批次
+     */
+   @TableField("SHOP_ORDER")
+   private String shopOrder;
+    /**
+     * 生产批次
+     */
+   @TableField("SFC")
+   private String sfc;
+    /**
+     * 组件物料
+     */
+   @TableField("ITEM")
+   private String item;
+    /**
+     * 库存编号
+     */
+   @TableField("INVENTORY")
+   private String inventory;
+    /**
+     * 发料数量
+     */
+   @TableField("QTY")
+   private Double qty;
+    /**
+     * 创建用户
+     */
+   @TableField("CREATE_USER")
+   private String createUser;
+    /**
+     * 创建时间
+     */
+   @TableField("CREATED_DATE_TIME")
+   private LocalDateTime createdDateTime;
+    /**
+     * 更新用户
+     */
+   @TableField("MODIFY_USER")
+   private String modifyUser;
+    /**
+     * 更新时间
+     */
+   @TableField("MODIFIED_DATE_TIME")
+   private LocalDateTime modifiedDateTime;
+
+
+   public String getHandle() {
+      return handle;
+   }
+
+   public void setHandle(String handle) {
+      this.handle = handle;
+   }
+
+   public String getSite() {
+      return site;
+   }
+
+   public void setSite(String site) {
+      this.site = site;
+   }
+
+   public String getCallItemNo() {
+      return callItemNo;
+   }
+
+   public void setCallItemNo(String callItemNo) {
+      this.callItemNo = callItemNo;
+   }
+
+   public String getShopOrder() {
+      return shopOrder;
+   }
+
+   public void setShopOrder(String shopOrder) {
+      this.shopOrder = shopOrder;
+   }
+
+   public String getSfc() {
+      return sfc;
+   }
+
+   public void setSfc(String sfc) {
+      this.sfc = sfc;
+   }
+
+   public String getItem() {
+      return item;
+   }
+
+   public void setItem(String item) {
+      this.item = item;
+   }
+
+   public String getInventory() {
+      return inventory;
+   }
+
+   public void setInventory(String inventory) {
+      this.inventory = inventory;
+   }
+
+   public Double getQty() {
+      return qty;
+   }
+
+   public void setQty(Double qty) {
+      this.qty = qty;
+   }
+
+   public String getCreateUser() {
+      return createUser;
+   }
+
+   public void setCreateUser(String createUser) {
+      this.createUser = createUser;
+   }
+
+   public LocalDateTime getCreatedDateTime() {
+      return createdDateTime;
+   }
+
+   public void setCreatedDateTime(LocalDateTime createdDateTime) {
+      this.createdDateTime = createdDateTime;
+   }
+
+   public String getModifyUser() {
+      return modifyUser;
+   }
+
+   public void setModifyUser(String modifyUser) {
+      this.modifyUser = modifyUser;
+   }
+
+   public LocalDateTime getModifiedDateTime() {
+      return modifiedDateTime;
+   }
+
+   public void setModifiedDateTime(LocalDateTime modifiedDateTime) {
+      this.modifiedDateTime = modifiedDateTime;
+   }
+
+public static final String HANDLE = "HANDLE";
+
+public static final String SITE = "SITE";
+
+public static final String CALL_ITEM_NO = "CALL_ITEM_NO";
+
+public static final String SHOP_ORDER = "SHOP_ORDER";
+
+public static final String SFC = "SFC";
+
+public static final String ITEM = "ITEM";
+
+public static final String INVENTORY = "INVENTORY";
+
+public static final String QTY = "QTY";
+
+public static final String CREATE_USER = "CREATE_USER";
+
+public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME";
+
+public static final String MODIFY_USER = "MODIFY_USER";
+
+public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
+
+
+   @Override
+   protected Serializable pkVal() {
+      return this.handle;
+   }
+
+   @Override
+   public String toString() {
+      return "IssueItem{" +
+         "handle = " + handle +
+         ", site = " + site +
+         ", callItemNo = " + callItemNo +
+         ", shopOrder = " + shopOrder +
+         ", sfc = " + sfc +
+         ", item = " + item +
+         ", inventory = " + inventory +
+         ", qty = " + qty +
+         ", createUser = " + createUser +
+         ", createdDateTime = " + createdDateTime +
+         ", modifyUser = " + modifyUser +
+         ", modifiedDateTime = " + modifiedDateTime +
+         "}";
+   }
+}

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/SurplusItemReturn.java

@@ -0,0 +1,233 @@
+package com.foreverwin.mesnac.dispatch.model;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+
+/**
+ * <p>
+ * 余料退回
+ * </p>
+ *
+ * @author Leon.L
+ * @since 2021-07-10
+ */
+
+@TableName("Z_SURPLUS_ITEM_RETURN")
+
+public class SurplusItemReturn extends Model<SurplusItemReturn> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+   @TableId(value = "HANDLE", type = IdType.INPUT)
+   private String handle;
+    /**
+     * 站点
+     */
+   @TableField("SITE")
+   private String site;
+    /**
+     * 库存批次
+     */
+   @TableField("INVENTORY")
+   private String inventory;
+    /**
+     * 父库存批次
+     */
+   @TableField("PARENT_INVENTORY")
+   private String parentInventory;
+    /**
+     * 物料编号
+     */
+   @TableField("ITEM_BO")
+   private String itemBo;
+    /**
+     * 余料长度
+     */
+   @TableField("LENGHT")
+   private Double lenght;
+    /**
+     * 余料宽度
+     */
+   @TableField("WIDTH")
+   private Double width;
+    /**
+     * 余料数量
+     */
+   @TableField("QTY")
+   private Double qty;
+    /**
+     * 创建用户
+     */
+   @TableField("CREATE_USER_BO")
+   private String createUserBo;
+    /**
+     * 创建时间
+     */
+   @TableField("CREATED_DATE_TIME")
+   private LocalDateTime createdDateTime;
+    /**
+     * 更新用户
+     */
+   @TableField("UPDATE_USER_BO")
+   private String updateUserBo;
+    /**
+     * 更新时间
+     */
+   @TableField("UPDATED_DATE_TIME")
+   private LocalDateTime updatedDateTime;
+
+
+   public String getHandle() {
+      return handle;
+   }
+
+   public void setHandle(String handle) {
+      this.handle = handle;
+   }
+
+   public String getSite() {
+      return site;
+   }
+
+   public void setSite(String site) {
+      this.site = site;
+   }
+
+   public String getInventory() {
+      return inventory;
+   }
+
+   public void setInventory(String inventory) {
+      this.inventory = inventory;
+   }
+
+   public String getParentInventory() {
+      return parentInventory;
+   }
+
+   public void setParentInventory(String parentInventory) {
+      this.parentInventory = parentInventory;
+   }
+
+   public String getItemBo() {
+      return itemBo;
+   }
+
+   public void setItemBo(String itemBo) {
+      this.itemBo = itemBo;
+   }
+
+   public Double getLenght() {
+      return lenght;
+   }
+
+   public void setLenght(Double lenght) {
+      this.lenght = lenght;
+   }
+
+   public Double getWidth() {
+      return width;
+   }
+
+   public void setWidth(Double width) {
+      this.width = width;
+   }
+
+   public Double getQty() {
+      return qty;
+   }
+
+   public void setQty(Double qty) {
+      this.qty = qty;
+   }
+
+   public String getCreateUserBo() {
+      return createUserBo;
+   }
+
+   public void setCreateUserBo(String createUserBo) {
+      this.createUserBo = createUserBo;
+   }
+
+   public LocalDateTime getCreatedDateTime() {
+      return createdDateTime;
+   }
+
+   public void setCreatedDateTime(LocalDateTime createdDateTime) {
+      this.createdDateTime = createdDateTime;
+   }
+
+   public String getUpdateUserBo() {
+      return updateUserBo;
+   }
+
+   public void setUpdateUserBo(String updateUserBo) {
+      this.updateUserBo = updateUserBo;
+   }
+
+   public LocalDateTime getUpdatedDateTime() {
+      return updatedDateTime;
+   }
+
+   public void setUpdatedDateTime(LocalDateTime updatedDateTime) {
+      this.updatedDateTime = updatedDateTime;
+   }
+
+public static final String HANDLE = "HANDLE";
+
+public static final String SITE = "SITE";
+
+public static final String INVENTORY = "INVENTORY";
+
+public static final String PARENT_INVENTORY = "PARENT_INVENTORY";
+
+public static final String ITEM_BO = "ITEM_BO";
+
+public static final String LENGHT = "LENGHT";
+
+public static final String WIDTH = "WIDTH";
+
+public static final String QTY = "QTY";
+
+public static final String CREATE_USER_BO = "CREATE_USER_BO";
+
+public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME";
+
+public static final String UPDATE_USER_BO = "UPDATE_USER_BO";
+
+public static final String UPDATED_DATE_TIME = "UPDATED_DATE_TIME";
+
+
+   @Override
+   protected Serializable pkVal() {
+      return this.handle;
+   }
+
+   @Override
+   public String toString() {
+      return "SurplusItemReturn{" +
+         "handle = " + handle +
+         ", site = " + site +
+         ", inventory = " + inventory +
+         ", parentInventory = " + parentInventory +
+         ", itemBo = " + itemBo +
+         ", lenght = " + lenght +
+         ", width = " + width +
+         ", qty = " + qty +
+         ", createUserBo = " + createUserBo +
+         ", createdDateTime = " + createdDateTime +
+         ", updateUserBo = " + updateUserBo +
+         ", updatedDateTime = " + updatedDateTime +
+         "}";
+   }
+}

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/CallItemService.java

@@ -1,11 +1,9 @@
 package com.foreverwin.mesnac.dispatch.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.foreverwin.mesnac.common.dto.SfcDispatchDto;
+import com.foreverwin.mesnac.dispatch.dto.IssueItemDto;
 import com.foreverwin.mesnac.dispatch.model.CallItem;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.foreverwin.modular.core.util.FrontPage;
-
 import java.util.List;
 
 /**
@@ -19,29 +17,38 @@ import java.util.List;
 public interface CallItemService extends IService<CallItem> {
 
     /**
-     *  分页查询
-     * @param frontPage
+     * 生产叫料查询
+     *
+     * @param callItem
+     */
+    List<CallItem> findCallItemList(CallItem callItem);
+
+    /**
+     * 叫料明细查询
+     *
+     * @param callItem
      * @return
      */
-    IPage<CallItem> selectPage(FrontPage<CallItem> frontPage, CallItem callItem);
+    List<CallItem> findCallItemDetailList(CallItem callItem);
 
-    List<CallItem> selectList(CallItem callItem);
 
     /**
-     * 保存叫料数据
+     * 叫料明细查询
      *
      * @param site
-     * @param user
-     * @param sfcDispatchList
+     * @param dispatchBoList
+     * @return
      */
-    void saveCallItem(String site, String user, List<SfcDispatchDto> sfcDispatchList);
+    List<CallItem> findCallItemDetailListByDispatchBo(String site, List<String> dispatchBoList);
 
     /**
-     * 生产叫料查询
+     * 保存叫料数据
      *
-     * @param callItem
+     * @param site
+     * @param user
+     * @param sfcDispatchList
      */
-    List<CallItem> findCallItemList(CallItem callItem);
+    void saveCallItem(String site, String user, List<SfcDispatchDto> sfcDispatchList);
 
     /**
      * 叫料
@@ -61,4 +68,32 @@ public interface CallItemService extends IService<CallItem> {
      * @param callItemList
      */
     void confirmReceive(String site, String user, List<CallItem> callItemList);
+
+    /**
+     * 取消叫料
+     *
+     * @param site
+     * @param user
+     * @param callItemNoList
+     */
+    void cancelCallItem(String site, String user, List<String> callItemNoList);
+
+    /**
+     * 刷新需求时间
+     *
+     * @param site
+     * @param user
+     * @param callItemNoList
+     */
+    void refreshRequiredTime(String site, String user, List<String> callItemNoList);
+
+
+    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    /**
+     * 查询发料组件清单
+     *
+     * @param issueItemDto
+     * @return
+     */
+    List<CallItem> findIssueItemList(IssueItemDto issueItemDto);
 }

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/IssueItemService.java

@@ -0,0 +1,20 @@
+package com.foreverwin.mesnac.dispatch.service;
+;
+import com.foreverwin.mesnac.dispatch.model.IssueItem;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+
+/**
+ * <p>
+ * 车间发料 服务类
+ * </p>
+ *
+ * @author Leon.L
+ * @since 2021-07-09
+ */
+public interface IssueItemService extends IService<IssueItem> {
+
+    Map<String, Object> scanIssueInventory(String site, String item, String inventory);
+}

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/ItemBatchService.java

@@ -1,9 +1,8 @@
 package com.foreverwin.mesnac.dispatch.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
+
 import com.foreverwin.mesnac.dispatch.model.ItemBatch;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.foreverwin.modular.core.util.FrontPage;
 
 import java.util.List;
 
@@ -18,11 +17,12 @@ import java.util.List;
 public interface ItemBatchService extends IService<ItemBatch> {
 
     /**
-     *  分页查询
-     * @param frontPage
+     * 查询原材料的收获批次
+     *
+     * @param site
+     * @param item
+     * @param batch
      * @return
      */
-    IPage<ItemBatch> selectPage(FrontPage<ItemBatch> frontPage, ItemBatch itemBatch);
-
-    List<ItemBatch> selectList(ItemBatch itemBatch);
+    List<ItemBatch> findItemBatch(String site, String item, String batch);
 }

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SurplusItemReturnService.java

@@ -0,0 +1,29 @@
+package com.foreverwin.mesnac.dispatch.service;
+
+import com.foreverwin.mesnac.dispatch.model.SurplusItemReturn;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 余料退回 服务类
+ * </p>
+ *
+ * @author Leon.L
+ * @since 2021-07-10
+ */
+public interface SurplusItemReturnService extends IService<SurplusItemReturn> {
+
+    /**
+     * 查询库存信息
+     * --物料编号&描述
+     * --物料自定义字段
+     * --库存数量
+     *
+     * @param site
+     * @param inventory
+     * @return
+     */
+    Map<String, Object> getInventoryData(String site, String inventory);
+}

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java

@@ -4,6 +4,7 @@ import com.foreverwin.mesnac.common.constant.Constants;
 import com.foreverwin.mesnac.common.dto.SfcDispatchDto;
 import com.foreverwin.mesnac.common.enums.HandleEnum;
 import com.foreverwin.mesnac.common.util.StringUtil;
+import com.foreverwin.mesnac.dispatch.dto.IssueItemDto;
 import com.foreverwin.modular.core.exception.BusinessException;
 import com.foreverwin.modular.core.util.FrontPage;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -21,6 +22,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -38,20 +40,6 @@ public class CallItemServiceImpl extends ServiceImpl<CallItemMapper, CallItem> i
     @Autowired
     private CallItemMapper callItemMapper;
 
-    @Override
-    public IPage<CallItem> selectPage(FrontPage<CallItem> frontPage, CallItem callItem) {
-        QueryWrapper<CallItem> queryWrapper = new QueryWrapper<>();
-        queryWrapper.setEntity(callItem);
-        return super.page(frontPage.getPagePlus(), queryWrapper);
-    }
-
-    @Override
-    public List<CallItem> selectList(CallItem callItem) {
-        QueryWrapper<CallItem> queryWrapper = new QueryWrapper<>();
-        queryWrapper.setEntity(callItem);
-        return super.list(queryWrapper);
-    }
-
     @Override
     public void saveCallItem(String site, String user, List<SfcDispatchDto> sfcDispatchList) {
         if (sfcDispatchList == null || sfcDispatchList.size() <= 0) {
@@ -129,10 +117,19 @@ public class CallItemServiceImpl extends ServiceImpl<CallItemMapper, CallItem> i
 
     @Override
     public List<CallItem> findCallItemList(CallItem callItem) {
-
         return callItemMapper.findCallItemList(callItem);
     }
 
+    @Override
+    public List<CallItem> findCallItemDetailList(CallItem callItem) {
+        return callItemMapper.findCallItemDetailList(callItem);
+    }
+
+    @Override
+    public List<CallItem> findCallItemDetailListByDispatchBo(String site, List<String> dispatchBoList) {
+        return callItemMapper.findCallItemDetailListByDispatchBo(site, dispatchBoList);
+    }
+
     @Override
     public void callItem(String site, String user, List<CallItem> callItemList) {
         if (callItemList == null || callItemList.size() <= 0) {
@@ -140,7 +137,7 @@ public class CallItemServiceImpl extends ServiceImpl<CallItemMapper, CallItem> i
         }
 
         LocalDateTime dateTime = LocalDateTime.now();
-        callItemMapper.updateCallItemStatus(Constants.CALL_ITEM_STATUS_CALLED, user, dateTime, callItemList);
+        callItemMapper.updateCallItemStatusByDispatchBo(Constants.CALL_ITEM_STATUS_CALLED, user, dateTime, callItemList);
     }
 
     @Override
@@ -166,6 +163,38 @@ public class CallItemServiceImpl extends ServiceImpl<CallItemMapper, CallItem> i
         }
 
         LocalDateTime dateTime = LocalDateTime.now();
-        callItemMapper.updateCallItemStatus(Constants.CALL_ITEM_STATUS_ISSUED, user, dateTime, callItemList);
+        callItemMapper.updateCallItemStatusByDispatchBo(Constants.CALL_ITEM_STATUS_ISSUED, user, dateTime, callItemList);
+    }
+
+    @Override
+    public void cancelCallItem(String site, String user, List<String> callItemNoList) {
+        if (callItemNoList == null || callItemNoList.size() <= 0) {
+            return;
+        }
+
+        LocalDateTime dateTime = LocalDateTime.now();
+        callItemMapper.updateCallItemStatusByCallItemNo(Constants.CALL_ITEM_STATUS_CANCELED, user, dateTime, callItemNoList);
+    }
+
+    @Override
+    public void refreshRequiredTime(String site, String user, List<String> callItemNoList) {
+        if (callItemNoList == null || callItemNoList.size() <= 0) {
+            return;
+        }
+        callItemNoList.stream().distinct().collect(Collectors.toList());
+
+        LocalDateTime dateTime = LocalDateTime.now();
+        callItemMapper.refreshRequiredTime(user, dateTime, callItemNoList);
+    }
+
+
+    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    @Override
+    public List<CallItem> findIssueItemList(IssueItemDto issueItemDto) {
+        if (issueItemDto.getMatchResource()) {
+            return callItemMapper.finsIssueItemListToResource(issueItemDto);
+        } else {
+            return callItemMapper.finsIssueItemListNoResource(issueItemDto);
+        }
     }
 }

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/IssueItemServiceImpl.java

@@ -0,0 +1,81 @@
+package com.foreverwin.mesnac.dispatch.service.impl;
+
+import com.foreverwin.mesnac.common.enums.HandleEnum;
+import com.foreverwin.mesnac.dispatch.model.IssueItem;
+import com.foreverwin.mesnac.dispatch.mapper.IssueItemMapper;
+import com.foreverwin.mesnac.dispatch.model.ItemBatch;
+import com.foreverwin.mesnac.dispatch.service.IssueItemService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.foreverwin.mesnac.dispatch.service.ItemBatchService;
+import com.foreverwin.mesnac.meapi.model.Inventory;
+import com.foreverwin.mesnac.meapi.model.Item;
+import com.foreverwin.mesnac.meapi.service.InventoryService;
+import com.foreverwin.mesnac.meapi.service.ItemService;
+import com.foreverwin.modular.core.exception.BusinessException;
+import com.sap.me.common.MaterialType;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * <p>
+ * 车间发料 服务实现类
+ * </p>
+ *
+ * @author Leon.L
+ * @since 2021-07-09
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class IssueItemServiceImpl extends ServiceImpl<IssueItemMapper, IssueItem> implements IssueItemService {
+
+    @Autowired
+    private ItemService itemService;
+    @Autowired
+    private IssueItemMapper issueItemMapper;
+    @Autowired
+    private ItemBatchService itemBatchService;
+    @Autowired
+    private InventoryService inventoryService;
+
+
+    @Override
+    public Map<String, Object> scanIssueInventory(String site, String item, String inventory) {
+        Item itemModel = itemService.selectCurrent(site, item);
+        if (itemModel == null) {
+            throw BusinessException.build("物料【"  +item+"】当前版本不存在！");
+        }
+        String itemBo = itemModel.getHandle();
+        String materialType = itemModel.getMaterialType();
+
+        Map<String, Object> map = new HashMap<>();
+        //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        if (MaterialType.RAW.value().equals(materialType)){
+            //原材料
+            List<ItemBatch> itemBatchList = itemBatchService.findItemBatch(site, item, inventory);
+            if (itemBatchList == null || itemBatchList.size() <= 0) {
+                throw BusinessException.build("扫描的物料条码【 "+ inventory +" 】不存在！");
+            }
+        } else {
+            //半成品
+            String inventoryBo = HandleEnum.INVENTORY.getHandle(site, inventory);
+            Inventory inventoryModel = inventoryService.getById(inventoryBo);
+            if (inventoryModel == null) {
+                throw BusinessException.build("扫描的物料条码【 "+ inventory +" 】不存在！");
+            }
+            String invItemBo = inventoryModel.getItemBo();
+            if (invItemBo.equals(itemBo)) {
+                throw BusinessException.build("扫描的物料条码【 "+ inventory +" 】不是物料【"+ item +"】的库存！");
+            }
+            map.put("qty", inventoryModel.getQtyOnHand());
+        }
+
+
+        return map;
+    }
+}

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ItemBatchServiceImpl.java

@@ -1,8 +1,7 @@
 package com.foreverwin.mesnac.dispatch.service.impl;
 
-import com.foreverwin.modular.core.util.FrontPage;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import com.foreverwin.mesnac.common.util.StringUtil;
 import com.foreverwin.mesnac.dispatch.model.ItemBatch;
 import com.foreverwin.mesnac.dispatch.mapper.ItemBatchMapper;
 import com.foreverwin.mesnac.dispatch.service.ItemBatchService;
@@ -11,7 +10,11 @@ import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
+
 /**
  * <p>
  * 物料批次表 服务实现类
@@ -28,19 +31,16 @@ public class ItemBatchServiceImpl extends ServiceImpl<ItemBatchMapper, ItemBatch
     @Autowired
     private ItemBatchMapper itemBatchMapper;
 
-    @Override
-    public IPage<ItemBatch> selectPage(FrontPage<ItemBatch> frontPage, ItemBatch itemBatch) {
-        QueryWrapper<ItemBatch> queryWrapper = new QueryWrapper<>();
-        queryWrapper.setEntity(itemBatch);
-        return super.page(frontPage.getPagePlus(), queryWrapper);
-    }
 
     @Override
-    public List<ItemBatch> selectList(ItemBatch itemBatch) {
-        QueryWrapper<ItemBatch> queryWrapper = new QueryWrapper<>();
-        queryWrapper.setEntity(itemBatch);
-        return super.list(queryWrapper);
+    public List<ItemBatch> findItemBatch(String site, String item, String batch) {
+        Map<String, Object> queryMap = new HashMap<>();
+        queryMap.put(ItemBatch.SITE, site);
+        queryMap.put(ItemBatch.ITEM, item);
+        if (StringUtil.notBlank(batch)) {
+            queryMap.put(ItemBatch.BATCH, batch);
+        }
+
+        return itemBatchMapper.selectByMap(queryMap);
     }
-
-
 }

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java

@@ -5,22 +5,24 @@ import com.foreverwin.mesnac.common.constant.Constants;
 import com.foreverwin.mesnac.common.dto.SfcDispatchDto;
 import com.foreverwin.mesnac.common.enums.DispatchStatusEnum;
 import com.foreverwin.mesnac.common.enums.HandleEnum;
+import com.foreverwin.mesnac.common.service.ProdReadyTaskService;
 import com.foreverwin.mesnac.common.service.SfcDispatchCommonService;
 import com.foreverwin.mesnac.common.util.ExcelUtils;
 import com.foreverwin.mesnac.common.util.StringUtil;
+import com.foreverwin.mesnac.dispatch.mapper.SfcDispatchMapper;
+import com.foreverwin.mesnac.dispatch.model.SfcDispatch;
 import com.foreverwin.mesnac.dispatch.model.ShopOrderRelease;
 import com.foreverwin.mesnac.dispatch.model.UserResource;
 import com.foreverwin.mesnac.dispatch.service.CallItemService;
-import com.foreverwin.mesnac.dispatch.mapper.SfcDispatchMapper;
-import com.foreverwin.mesnac.dispatch.model.SfcDispatch;
 import com.foreverwin.mesnac.dispatch.service.SfcDispatchService;
 import com.foreverwin.mesnac.dispatch.service.UserResourceService;
 import com.foreverwin.mesnac.meapi.service.ResrceService;
 import com.foreverwin.mesnac.meapi.util.StringUtils;
 import com.foreverwin.modular.core.exception.BusinessException;
+import com.foreverwin.modular.core.util.CommonMethods;
 import org.apache.commons.fileupload.FileItem;
-import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -54,6 +56,8 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
     private SfcDispatchMapper sfcDispatchMapper;
     @Autowired
     private UserResourceService userResourceService;
+    @Autowired
+    private ProdReadyTaskService prodReadyTaskService;
 
     @Override
     public List<SfcDispatch> findSfcDispatch(String site, String sfc, String operation, String stepId) {
@@ -75,6 +79,9 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
         Boolean flag = this.sfcDispatch(site, user, DispatchStatusEnum.RELEASE.getCode(), message, sfcDispatchList);
 
         if (flag) {
+            //创建产前准备任务
+            prodReadyTaskService.createTask(sfcDispatchList);
+
             //保存叫料数据
             callItemService.saveCallItem(site, user, sfcDispatchList);
         }
@@ -166,11 +173,17 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
             sfcDispatch.setModifyUser(user);
             sfcDispatch.setModifiedDateTime(nowDate);
             list.add(sfcDispatch);
+
+
+            sfcDispatchDto.setDispatchStatus(DispatchStatusEnum.CANCEL.getCode());
         }
 
         if (list != null && list.size() > 0) {
             this.updateBatchById(list);
         }
+
+        //取消产前准备任务
+        prodReadyTaskService.createTask(sfcDispatchList);
     }
 
     @Override
@@ -195,6 +208,8 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
         return this.sfcDispatch(site, user, DispatchStatusEnum.IMPORT.getCode(), message, sfcDispatchList);
     }
 
+
+
     public String importDispatch(FileItem fileItem, HttpServletRequest httpServletRequest) {
         String site = httpServletRequest.getParameter("site");
         String user = httpServletRequest.getParameter("user");
@@ -329,6 +344,7 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
                 sfcDispatch.setSfcReleasedDate(nowDate);
                 //发布状态更新
                 sfcDispatch.setDispatchStatus(DispatchStatusEnum.RELEASE.getCode());
+                sfcDispatchDto.setDispatchStatus(DispatchStatusEnum.RELEASE.getCode());
             }
 
 
@@ -411,4 +427,19 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
         LocalDateTime nowDateTime = LocalDateTime.now();
         sfcDispatchMapper.updateSfcDispatchStatus(site, dispatchNo, dispatchStatus, user, nowDateTime);
     }
+
+    @Override
+    public SfcDispatchDto findResrceBySfc(SfcDispatchDto sfcDispatch) {
+        String site = CommonMethods.getSite();
+        String[] status = {"START","COMPLETE"};
+        return sfcDispatchMapper.findResrceBySfc(sfcDispatch,site,status);
+    }
+
+//    @Override
+//    public SfcDispatchDto findResrceBySfc(SfcDispatch sfcDispatch) {
+//        String site = CommonMethods.getSite();
+//        String[] status = {"START","COMPLETE"};
+//        return sfcDispatchMapper.findResrceBySfc(sfcDispatch,site,status);
+//    }
+
 }

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusItemReturnServiceImpl.java

@@ -0,0 +1,69 @@
+package com.foreverwin.mesnac.dispatch.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.foreverwin.mesnac.common.enums.HandleEnum;
+import com.foreverwin.mesnac.common.util.NumberUtil;
+import com.foreverwin.mesnac.common.util.StringUtil;
+import com.foreverwin.mesnac.dispatch.mapper.SurplusItemReturnMapper;
+import com.foreverwin.mesnac.dispatch.model.SurplusItemReturn;
+import com.foreverwin.mesnac.dispatch.service.SurplusItemReturnService;
+import com.foreverwin.mesnac.meapi.model.Inventory;
+import com.foreverwin.mesnac.meapi.service.InventoryService;
+import com.foreverwin.modular.core.exception.BusinessException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 余料退回 服务实现类
+ * </p>
+ *
+ * @author Leon.L
+ * @since 2021-07-10
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class SurplusItemReturnServiceImpl extends ServiceImpl<SurplusItemReturnMapper, SurplusItemReturn> implements SurplusItemReturnService {
+
+
+    @Autowired
+    private InventoryService inventoryService;
+    @Autowired
+    private SurplusItemReturnMapper surplusItemReturnMapper;
+
+
+    @Override
+    public Map<String, Object> getInventoryData(String site, String inventory) {
+        String inventoryBo = HandleEnum.INVENTORY.getHandle(site, inventory);
+        Inventory inventoryModel = inventoryService.getById(inventoryBo);
+        if (inventoryModel == null) {
+            throw BusinessException.build("物料条码【" + inventory +"】不存在！");
+        }
+        if (inventoryModel.getQtyOnHand().doubleValue() <= 0) {
+            throw BusinessException.build("物料条码【" + inventory +"】没有可用数量！");
+        }
+
+        //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        Map<String, Object> map = surplusItemReturnMapper.selectInventoryData(inventoryBo);
+        if (map == null || map.size() <= 0) {
+            throw BusinessException.build("物料条码【" + inventory +"】不存在！");
+        }
+        String item = (String) map.get("ITEM");
+        String perMater = (String) map.get("PER_METER");
+        String perSquareMeter = (String) map.get("PER_SQUARE_METER");
+        if (StringUtil.isBlank(perMater) && StringUtil.isBlank(perSquareMeter)) {
+            throw BusinessException.build("物料【" +item+ "】的自定义字段【每米重量】和【每平米重量】都没维护！");
+        }
+        if (StringUtil.notBlank(perMater) && !NumberUtil.isNumber(perMater)) {
+            throw BusinessException.build("物料【" +item+ "】的自定义字段【每米重量】只能维护数值！");
+        }
+        if (StringUtil.notBlank(perSquareMeter) && !NumberUtil.isNumber(perSquareMeter)) {
+            throw BusinessException.build("物料【" +item+ "】的自定义字段【每平米重量】只能维护数值！");
+        }
+
+        return map;
+    }
+}

dispatch/src/main/resources/mapper/CallItemMapper.xml

@@ -28,8 +28,11 @@
 
     <resultMap id="FullResultMap" type="com.foreverwin.mesnac.dispatch.model.CallItem" extends="BaseResultMap">
         <result column="ITEM" property="item" />
+        <result column="COMPONENT" property="component" />
         <result column="ITEM_DESCRIPTION" property="itemDescription" />
         <result column="MATERIAL_TYPE" property="materialType" />
+        <result column="EMPLOYEE" property="employee" />
+        <result column="SOURCE_RESOURCE" property="sourceResource" />
         <result column="WORK_ORDER" property="workOrder" />
         <result column="WORK_CENTER" property="workCenter" />
         <result column="DISPATCH_NO" property="dispatchNo" />
@@ -621,14 +624,14 @@
     </select>
 
     <select id="findCallItemList" resultMap="FullResultMap">
-        SELECT  ZCI.HANDLE, ZCI.SITE, CF.VALUE WORK_ORDER, ZSD.WORK_CENTER, ZSD.SHOP_ORDER, ZSD.SFC, ZSD.DISPATCH_NO, IT.ITEM, IT.DESCRIPTION ITEM_DESCRIPTION, ZSD.BLANKING_SIZE,
-                ZSD.STEP_ID, ZCI.SFC_DISPATCH_BO ,ZSD.DISPATCH_STATUS, ZCI.OPERATION, OPT.DESCRIPTION OPERATION_DESCRIPTION, ZSD.RESOURCE_TYPE, ZCI.RESRCE, ZSD.DISPATCH_QTY, ZSD.PLANNED_START_DATE, ZSD.REMARK
+        SELECT  ZCI.HANDLE, ZCI.SITE, CF.VALUE WORK_ORDER, ZSD.WORK_CENTER, ZSD.SHOP_ORDER, ZSD.SFC, ZSD.DISPATCH_NO, IT.ITEM, ITT.DESCRIPTION ITEM_DESCRIPTION, ZSD.BLANKING_SIZE,
+                ZSD.STEP_ID, ZCI.SFC_DISPATCH_BO, ZSD.DISPATCH_STATUS, ZCI.OPERATION, OPT.DESCRIPTION OPERATION_DESCRIPTION, ZSD.RESOURCE_TYPE, ZCI.RESRCE, ZSD.DISPATCH_QTY, ZSD.PLANNED_START_DATE, ZSD.REMARK
         FROM Z_SFC_DISPATCH ZSD
         INNER JOIN Z_CALL_ITEM ZCI ON ZCI.SFC_DISPATCH_BO = ZSD.HANDLE
         INNER JOIN SHOP_ORDER SO ON SO.SITE = ZSD.SITE AND ZSD.SHOP_ORDER = SO.SHOP_ORDER
         LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = SO.HANDLE AND CF.ATTRIBUTE = 'WORK_ORDER'
         INNER JOIN ITEM IT ON IT.HANDLE = SO.ITEM_BO
-        LEFT JOIN ITEM_T IT ON IT.ITEM_BO = IT.HANDLE AND IT.LOCALE = 'zh'
+        LEFT JOIN ITEM_T ITT ON ITT.ITEM_BO = IT.HANDLE AND ITT.LOCALE = 'zh'
         INNER JOIN OPERATION OP ON OP.SITE = ZCI.SITE AND OP.OPERATION = ZCI.OPERATION AND OP.CURRENT_REVISION = 'true'
         LEFT JOIN OPERATION_T OPT ON OPT.OPERATION_BO = OP.HANDLE AND OPT.LOCALE = 'zh'
         WHERE ZSD.SITE = #{site}
@@ -650,16 +653,232 @@
         <if test="resrce != null and resrce != ''">
             AND ZCI.RESRCE = #{resrce}
         </if>
-        GROUP BY ZCI.HANDLE, ZCI.SITE, CF.VALUE, ZSD.WORK_CENTER, ZSD.SHOP_ORDER, ZSD.SFC, ZSD.DISPATCH_NO, IT.ITEM, IT.DESCRIPTION, ZSD.BLANKING_SIZE,
-                 ZSD.STEP_ID, ZCI.SFC_DISPATCH_BO ,ZSD.DISPATCH_STATUS, ZCI.OPERATION, OPT.DESCRIPTION, ZSD.RESOURCE_TYPE, ZCI.RESRCE, ZSD.DISPATCH_QTY, ZSD.PLANNED_START_DATE, ZSD.REMARK
+        GROUP BY ZCI.HANDLE, ZCI.SITE, CF.VALUE, ZSD.WORK_CENTER, ZSD.SHOP_ORDER, ZSD.SFC, ZSD.DISPATCH_NO, IT.ITEM, ITT.DESCRIPTION, ZSD.BLANKING_SIZE,
+                 ZSD.STEP_ID, ZCI.SFC_DISPATCH_BO, ZSD.DISPATCH_STATUS, ZCI.OPERATION, OPT.DESCRIPTION, ZSD.RESOURCE_TYPE, ZCI.RESRCE, ZSD.DISPATCH_QTY, ZSD.PLANNED_START_DATE, ZSD.REMARK
         ORDER BY ZSD.SFC, ZSD.STEP_ID
     </select>
 
-    <update id="updateCallItemStatus">
+    <select id="findCallItemDetailList" resultMap="FullResultMap">
+        SELECT 	ZCI.HANDLE, ZCI.SITE, ZCI.CALL_ITEM_NO, CF.VALUE WORK_ORDER, ZCI.SHOP_ORDER, ZCI.SFC, ZSD.DISPATCH_NO, CP.ITEM, CT.DESCRIPTION ITEM_DESCRIPTION, ZSD.BLANKING_SIZE, ZSD.STEP_ID,
+                ZCI.STATUS, ZCI.OPERATION, OT.DESCRIPTION OPERATION_DESCRIPTION, ZSD.RESOURCE_TYPE, ZCI.RESRCE, ZSD.EMPLOYEE, ZCI.REQUIRED_DATE_TIME, ZCI.REQUIRED_QTY, ZCI.CALL_TYPE, ZSD.PLANNED_START_DATE,
+                CASE WHEN ZCI.CALL_TYPE = 'OPERATION' AND CS.VALUE = 'Y' THEN N'外协'
+                     WHEN ZCI.CALL_TYPE = 'OPERATION' AND (CS.VALUE IS NULL OR CS.VALUE = 'N') THEN ZSDD.RESRCE
+                     WHEN ZSH.RESRCE IS NOT NULL THEN ZSH.RESRCE END SOURCE_RESOURCE
+        FROM Z_CALL_ITEM ZCI
+        INNER JOIN Z_SFC_DISPATCH ZSD ON ZSD.HANDLE = ZCI.SFC_DISPATCH_BO
+        INNER JOIN SFC SC ON SC.SITE = ZSD.SITE AND SC.SFC = ZSD.SFC
+        INNER JOIN SHOP_ORDER SO ON SO.SITE = ZCI.SITE AND SO.SHOP_ORDER = ZCI.SHOP_ORDER
+        LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = SO.HANDLE AND CF."ATTRIBUTE" = 'WORK_ORDER'
+        INNER JOIN ITEM CP ON CP.HANDLE = ZCI.COMPONENT_BO
+        LEFT JOIN ITEM_T CT ON CT.ITEM_BO = CP.HANDLE AND CT.LOCALE = 'zh'
+        INNER JOIN OPERATION OP ON OP.SITE = ZCI.SITE AND OP.OPERATION = ZCI.OPERATION AND OP.CURRENT_REVISION = 'true'
+        LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = OP.HANDLE AND OT.LOCALE = 'zh'
+        LEFT JOIN Z_SFC_DISPATCH ZSDD ON ZSDD.SITE = ZSD.SITE AND ZSDD.SFC = ZSD.SFC AND ZSDD.STEP_ID = ZSD.PREPOSITION_STEP_ID
+        INNER JOIN SFC_ROUTER SR ON SR.SFC_ROUTING_BO = 'SFCRoutingBO:'||SC.HANDLE
+        LEFT JOIN ROUTER_STEP RS ON RS.ROUTER_BO = SR.ROUTER_BO AND RS.STEP_ID = ZSDD.STEP_ID
+        LEFT JOIN ROUTER_OPERATION RO ON RO.ROUTER_STEP_BO = RS.HANDLE
+        LEFT JOIN CUSTOM_FIELDS CS ON CS.HANDLE = RO.HANDLE AND CS."ATTRIBUTE" = 'OUT_SOURCE'
+        LEFT JOIN (
+            SELECT SC.SITE, IV.ITEM_BO, ZS.SFC, ZS.DISPATCH_SEQ
+            FROM SFC SC
+            INNER JOIN INVENTORY IV ON IV.SITE = SC.SITE AND SC.SFC = IV.INVENTORY_ID
+            INNER JOIN (
+                SELECT SITE, SFC, MAX(DISPATCH_SEQ) DISPATCH_SEQ
+                FROM Z_SFC_DISPATCH
+                GROUP BY SITE, SFC
+            ) ZS ON ZS.SITE = SC.SITE AND ZS.SFC = SC.SFC
+            WHERE IV.QTY_ON_HAND > 0
+        ) VS ON VS.SITE = ZCI.SITE AND VS.ITEM_BO = ZCI.COMPONENT_BO
+        LEFT JOIN Z_SFC_DISPATCH ZSH ON ZSH.SITE = VS.SITE AND ZSH.SFC = VS.SFC AND ZSH.DISPATCH_SEQ = VS.DISPATCH_SEQ
+        WHERE ZCI.SITE = #{site}
+        <if test="workCenter != null and workCenter != ''" >
+            AND ZSD.WORK_CENTER = #{workCenter}
+        </if>
+        <if test="workOrder != null and workOrder != ''" >
+            AND CF.VALUE = #{workOrder}
+        </if>
+        <if test="shopOrder != null and shopOrder != ''" >
+            AND SO.SHOP_ORDER = #{shopOrder}
+        </if>
+        <if test="dispatchNo != null and dispatchNo != ''" >
+            AND ZSD.DISPATCH_NO = #{dispatchNo}
+        </if>
+        <if test="dispatchStatus != null and dispatchStatus != ''" >
+            AND ZSD.DISPATCH_STATUS = #{dispatchStatus}
+        </if>
+        <if test="status != null and status != ''" >
+            AND ZCI.STATUS = #{status}
+        </if>
+        <if test="resourceType != null and resourceType != ''" >
+            AND ZSD.RESOURCE_TYPE = #{resourceType}
+        </if>
+        <if test="resrce != null and resrce != ''" >
+            AND ZSD.RESRCE = #{resrce}
+        </if>
+        <if test="component != null and component != ''" >
+            AND CP.ITEM = #{component}
+        </if>
+        <if test="callType != null and callType != ''" >
+            AND ZCI.CALL_TYPE = #{callType}
+        </if>
+        ORDER BY ZSD.SFC, ZSD.STEP_ID, ZCI.CALL_TYPE
+    </select>
+
+    <select id="findCallItemDetailListByDispatchBo" resultMap="FullResultMap">
+        SELECT 	ZCI.HANDLE, ZCI.SITE, ZCI.CALL_ITEM_NO, CF.VALUE WORK_ORDER, ZCI.SHOP_ORDER, ZCI.SFC, ZSD.DISPATCH_NO, CP.ITEM, CT.DESCRIPTION ITEM_DESCRIPTION, ZSD.BLANKING_SIZE, ZSD.STEP_ID,
+                ZCI.STATUS, ZCI.OPERATION, OT.DESCRIPTION OPERATION_DESCRIPTION, ZSD.RESOURCE_TYPE, ZCI.RESRCE, ZSD.EMPLOYEE, ZCI.REQUIRED_DATE_TIME, ZCI.REQUIRED_QTY, ZCI.CALL_TYPE, ZSD.PLANNED_START_DATE,
+                CASE WHEN ZCI.CALL_TYPE = 'OPERATION' AND CS.VALUE = 'Y' THEN N'外协'
+                     WHEN ZCI.CALL_TYPE = 'OPERATION' AND (CS.VALUE IS NULL OR CS.VALUE = 'N') THEN ZSDD.RESRCE
+                     WHEN ZSH.RESRCE IS NOT NULL THEN ZSH.RESRCE END SOURCE_RESOURCE
+        FROM Z_CALL_ITEM ZCI
+        INNER JOIN Z_SFC_DISPATCH ZSD ON ZSD.HANDLE = ZCI.SFC_DISPATCH_BO
+        INNER JOIN SFC SC ON SC.SITE = ZSD.SITE AND SC.SFC = ZSD.SFC
+        INNER JOIN SHOP_ORDER SO ON SO.SITE = ZCI.SITE AND SO.SHOP_ORDER = ZCI.SHOP_ORDER
+        LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = SO.HANDLE AND CF."ATTRIBUTE" = 'WORK_ORDER'
+        INNER JOIN ITEM CP ON CP.HANDLE = ZCI.COMPONENT_BO
+        LEFT JOIN ITEM_T CT ON CT.ITEM_BO = CP.HANDLE AND CT.LOCALE = 'zh'
+        INNER JOIN OPERATION OP ON OP.SITE = ZCI.SITE AND OP.OPERATION = ZCI.OPERATION AND OP.CURRENT_REVISION = 'true'
+        LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = OP.HANDLE AND OT.LOCALE = 'zh'
+        LEFT JOIN Z_SFC_DISPATCH ZSDD ON ZSDD.SITE = ZSD.SITE AND ZSDD.SFC = ZSD.SFC AND ZSDD.STEP_ID = ZSD.PREPOSITION_STEP_ID
+        INNER JOIN SFC_ROUTER SR ON SR.SFC_ROUTING_BO = 'SFCRoutingBO:'||SC.HANDLE
+        LEFT JOIN ROUTER_STEP RS ON RS.ROUTER_BO = SR.ROUTER_BO AND RS.STEP_ID = ZSDD.STEP_ID
+        LEFT JOIN ROUTER_OPERATION RO ON RO.ROUTER_STEP_BO = RS.HANDLE
+        LEFT JOIN CUSTOM_FIELDS CS ON CS.HANDLE = RO.HANDLE AND CS."ATTRIBUTE" = 'OUT_SOURCE'
+        LEFT JOIN (
+            SELECT SC.SITE, IV.ITEM_BO, ZS.SFC, ZS.DISPATCH_SEQ
+            FROM SFC SC
+            INNER JOIN INVENTORY IV ON IV.SITE = SC.SITE AND SC.SFC = IV.INVENTORY_ID
+            INNER JOIN (
+                SELECT SITE, SFC, MAX(DISPATCH_SEQ) DISPATCH_SEQ
+                FROM Z_SFC_DISPATCH
+                GROUP BY SITE, SFC
+            ) ZS ON ZS.SITE = SC.SITE AND ZS.SFC = SC.SFC
+            WHERE IV.QTY_ON_HAND > 0
+        ) VS ON VS.SITE = ZCI.SITE AND VS.ITEM_BO = ZCI.COMPONENT_BO
+        LEFT JOIN Z_SFC_DISPATCH ZSH ON ZSH.SITE = VS.SITE AND ZSH.SFC = VS.SFC AND ZSH.DISPATCH_SEQ = VS.DISPATCH_SEQ
+        WHERE ZCI.SITE = #{site}
+            AND ZCI.SFC_DISPATCH_BO IN
+            <foreach item="item" collection="list" separator="," open="(" close=")" index="">
+                #{item}
+            </foreach>
+        ORDER BY ZSD.SFC, ZSD.STEP_ID, ZCI.CALL_TYPE
+    </select>
+
+    <update id="updateCallItemStatusByDispatchBo">
         UPDATE Z_CALL_ITEM SET STATUS = #{status}, UPDATE_USER = #{user}, UPDATED_DATE_TIME = #{dateTime}
         WHERE STATUS != '804' AND  SFC_DISPATCH_BO IN
         <foreach item="item" collection="list" separator="," open="(" close=")" index="">
             #{item.sfcDispatchBo}
         </foreach>
     </update>
+
+    <update id="updateCallItemStatusByCallItemNo">
+        UPDATE Z_CALL_ITEM SET STATUS = #{status}, UPDATE_USER = #{user}, UPDATED_DATE_TIME = #{dateTime}
+        WHERE STATUS != '804' AND  CALL_ITEM_NO IN
+        <foreach item="item" collection="list" separator="," open="(" close=")" index="">
+            #{item}
+        </foreach>
+    </update>
+
+    <update id="refreshRequiredTime">
+        UPDATE Z_CALL_ITEM SET UPDATE_USER = #{user}, UPDATED_DATE_TIME = #{dateTime}, REQUIRED_DATE_TIME = (
+            SELECT ZSD.PLANNED_START_DATE
+            FROM Z_SFC_DISPATCH ZSD
+            WHERE Z_CALL_ITEM.SFC_DISPATCH_BO = ZSD.HANDLE
+        )
+        WHERE Z_CALL_ITEM.CALL_ITEM_NO IN
+        <foreach item="item" collection="list" separator="," open="(" close=")" index="">
+            #{item}
+        </foreach>
+    </update>
+
+    <select id="finsIssueItemListToResource" resultMap="FullResultMap">
+        SELECT VIP.SITE, VIP.WORK_ORDER, VIP.CALL_TYPE, VIP.ITEM_BO, VIP.ITEM, VIP.ITEM_DESCRIPTION, VIP.REQUIRED_QTY, VIP.BLANKING_SIZE, VIP.RESRCE, SIP.SOURCE_RESOURCE
+        FROM (
+            SELECT L.SITE, CF.VALUE WORK_ORDER, L.CALL_TYPE, CP.HANDLE ITEM_BO, CP.ITEM, CT.DESCRIPTION ITEM_DESCRIPTION, SUM(L.REQUIRED_QTY) REQUIRED_QTY, W.BLANKING_SIZE, W.RESRCE
+            FROM Z_CALL_ITEM L
+            INNER JOIN Z_SFC_DISPATCH W ON L.SFC_DISPATCH_BO = W.HANDLE
+            INNER JOIN ITEM CP ON CP.HANDLE = L.COMPONENT_BO
+            LEFT JOIN ITEM_T CT ON CT.ITEM_BO = CP.HANDLE AND CT.LOCALE = 'zh'
+            INNER JOIN SHOP_ORDER SO ON SO.SITE = L.SITE AND SO.SHOP_ORDER = L.SHOP_ORDER
+            LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = SO.HANDLE AND CF."ATTRIBUTE" = 'WORK_ORDER'
+            WHERE L.SITE = #{site} AND L.CALL_TYPE = 'MATERIAL'
+            <if test="workCenter != null and workCenter != ''">
+              AND W.WORK_CENTER = #{workCenter}
+            </if>
+            <if test="resource != null and resource != ''">
+              AND W.RESRCE = #{resource}
+            </if>
+            <if test="shopOrder != null and shopOrder != ''">
+              AND SO.SHOP_ORDER = #{shopOrder}
+            </if>
+            <if test="dispatchNo != null and dispatchNo != ''">
+              AND W.DISPATCH_NO = #{dispatchNo}
+            </if>
+            <if test="requiredFromDT != null">
+              AND L.REQUIRED_DATE_TIME >= #{requiredFromDT}
+            </if>
+            <if test="requiredToDT != null">
+                AND L.REQUIRED_DATE_TIME &lt;= #{requiredToDT}
+            </if>
+            GROUP BY L.SITE, CF.VALUE, L.CALL_TYPE, CP.HANDLE, CP.ITEM, CT.DESCRIPTION, W.BLANKING_SIZE, W.RESRCE
+        ) VIP
+        LEFT JOIN (
+            SELECT L.SITE, L.ITEM_BO, ZD.RESRCE SOURCE_RESOURCE
+            FROM SFC L
+            INNER JOIN INVENTORY W ON W.SITE = L.SITE AND L.SFC = W.INVENTORY_ID
+            INNER JOIN (
+                SELECT SITE, SFC, MAX(DISPATCH_SEQ) DISPATCH_SEQ
+                FROM Z_SFC_DISPATCH GROUP BY SITE, SFC
+            ) ZS ON ZS.SITE = L.SITE AND ZS.SFC = L.SFC
+            INNER JOIN Z_SFC_DISPATCH ZD ON ZD.SITE = ZS.SITE AND ZD.SFC = ZS.SFC AND ZD.DISPATCH_SEQ = ZS.DISPATCH_SEQ
+            WHERE W.QTY_ON_HAND > 0
+        ) SIP
+        ON VIP.SITE = SIP.SITE AND VIP.ITEM_BO = SIP.ITEM_BO
+    </select>
+
+    <select id="finsIssueItemListNoResource" resultMap="FullResultMap">
+        SELECT VIP.SITE, VIP.WORK_ORDER, VIP.CALL_TYPE, VIP.ITEM_BO, VIP.ITEM, VIP.ITEM_DESCRIPTION, VIP.REQUIRED_QTY, VIP.BLANKING_SIZE, SIP.SOURCE_RESOURCE
+        FROM (
+            SELECT L.SITE, CF.VALUE WORK_ORDER, L.CALL_TYPE, CP.HANDLE ITEM_BO, CP.ITEM, CT.DESCRIPTION ITEM_DESCRIPTION, SUM(L.REQUIRED_QTY) REQUIRED_QTY, W.BLANKING_SIZE
+            FROM Z_CALL_ITEM L
+            INNER JOIN Z_SFC_DISPATCH W ON L.SFC_DISPATCH_BO = W.HANDLE
+            INNER JOIN ITEM CP ON CP.HANDLE = L.COMPONENT_BO
+            LEFT JOIN ITEM_T CT ON CT.ITEM_BO = CP.HANDLE AND CT.LOCALE = 'zh'
+            INNER JOIN SHOP_ORDER SO ON SO.SITE = L.SITE AND SO.SHOP_ORDER = L.SHOP_ORDER
+            LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = SO.HANDLE AND CF."ATTRIBUTE" = 'WORK_ORDER'
+            WHERE L.SITE = #{site} AND L.CALL_TYPE = 'MATERIAL'
+            <if test="workCenter != null and workCenter != ''">
+                AND W.WORK_CENTER = #{workCenter}
+            </if>
+            <if test="resource != null and resource != ''">
+                AND W.RESRCE = #{resource}
+            </if>
+            <if test="shopOrder != null and shopOrder != ''">
+                AND SO.SHOP_ORDER = #{shopOrder}
+            </if>
+            <if test="dispatchNo != null and dispatchNo != ''">
+                AND W.DISPATCH_NO = #{dispatchNo}
+            </if>
+            <if test="requiredFromDT != null">
+                AND L.REQUIRED_DATE_TIME >= #{requiredFromDT}
+            </if>
+            <if test="requiredToDT != null">
+                AND L.REQUIRED_DATE_TIME &lt;= #{requiredToDT}
+            </if>
+            GROUP BY L.SITE, CF.VALUE, L.CALL_TYPE, CP.HANDLE, CP.ITEM, CT.DESCRIPTION, W.BLANKING_SIZE
+        ) VIP
+        LEFT JOIN (
+            SELECT L.SITE, L.ITEM_BO, ZD.RESRCE SOURCE_RESOURCE
+            FROM SFC L
+            INNER JOIN INVENTORY W ON W.SITE = L.SITE AND L.SFC = W.INVENTORY_ID
+            INNER JOIN (
+                SELECT SITE, SFC, MAX(DISPATCH_SEQ) DISPATCH_SEQ
+                FROM Z_SFC_DISPATCH GROUP BY SITE, SFC
+            ) ZS ON ZS.SITE = L.SITE AND ZS.SFC = L.SFC
+            INNER JOIN Z_SFC_DISPATCH ZD ON ZD.SITE = ZS.SITE AND ZD.SFC = ZS.SFC AND ZD.DISPATCH_SEQ = ZS.DISPATCH_SEQ
+            WHERE W.QTY_ON_HAND > 0
+        ) SIP
+        ON VIP.SITE = SIP.SITE AND VIP.ITEM_BO = SIP.ITEM_BO
+    </select>
 </mapper>

dispatch/src/main/resources/mapper/IssueItemMapper.xml

@@ -0,0 +1,388 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.foreverwin.mesnac.dispatch.mapper.IssueItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.foreverwin.mesnac.dispatch.model.IssueItem">
+        <result column="HANDLE" property="handle" />
+        <result column="SITE" property="site" />
+        <result column="CALL_ITEM_NO" property="callItemNo" />
+        <result column="SHOP_ORDER" property="shopOrder" />
+        <result column="SFC" property="sfc" />
+        <result column="ITEM" property="item" />
+        <result column="INVENTORY" property="inventory" />
+        <result column="QTY" property="qty" />
+        <result column="CREATE_USER" property="createUser" />
+        <result column="CREATED_DATE_TIME" property="createdDateTime" />
+        <result column="MODIFY_USER" property="modifyUser" />
+        <result column="MODIFIED_DATE_TIME" property="modifiedDateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        HANDLE, SITE, CALL_ITEM_NO, SHOP_ORDER, SFC, ITEM, INVENTORY, QTY, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME
+    </sql>
+
+    <!-- BaseMapper标准查询/修改/删除 -->
+
+    <select id="selectByMap" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"></include>
+        FROM Z_ISSUE_ITEM
+        <if test="cm!=null and !cm.isEmpty">
+            <where>
+                <foreach collection="cm.keys" item="k" separator="AND">
+                    <if test="cm[k] != null">
+                        ${k} = #{cm[${k}]}
+                    </if>
+                </foreach>
+            </where>
+        </if>
+    </select>
+
+
+    <select id="selectOne" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"></include> FROM Z_ISSUE_ITEM
+        <where>
+            <if test="ew.entity.handle!=null">
+              HANDLE=#{ew.handle}
+            </if>
+            <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+            <if test="ew.entity.callItemNo!=null"> AND CALL_ITEM_NO=#{ew.entity.callItemNo}</if>
+            <if test="ew.entity.shopOrder!=null"> AND SHOP_ORDER=#{ew.entity.shopOrder}</if>
+            <if test="ew.entity.sfc!=null"> AND SFC=#{ew.entity.sfc}</if>
+            <if test="ew.entity.item!=null"> AND ITEM=#{ew.entity.item}</if>
+            <if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
+            <if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
+            <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
+            <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+            <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
+            <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+        </where>
+    </select>
+
+    <select id="selectCount" resultType="Integer">
+        SELECT COUNT(1) FROM Z_ISSUE_ITEM
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                <if test="ew.entity.handle!=null">
+                    HANDLE=#{ew.entity.handle}
+                </if>
+                <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                <if test="ew.entity.callItemNo!=null"> AND CALL_ITEM_NO=#{ew.entity.callItemNo}</if>
+                <if test="ew.entity.shopOrder!=null"> AND SHOP_ORDER=#{ew.entity.shopOrder}</if>
+                <if test="ew.entity.sfc!=null"> AND SFC=#{ew.entity.sfc}</if>
+                <if test="ew.entity.item!=null"> AND ITEM=#{ew.entity.item}</if>
+                <if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
+                <if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
+                <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
+                <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
+                <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectList" resultMap="BaseResultMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_ISSUE_ITEM
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.callItemNo!=null"> AND CALL_ITEM_NO=#{ew.entity.callItemNo}</if>
+                    <if test="ew.entity.shopOrder!=null"> AND SHOP_ORDER=#{ew.entity.shopOrder}</if>
+                    <if test="ew.entity.sfc!=null"> AND SFC=#{ew.entity.sfc}</if>
+                    <if test="ew.entity.item!=null"> AND ITEM=#{ew.entity.item}</if>
+                    <if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
+                    <if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
+                    <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectMaps" resultType="HashMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_ISSUE_ITEM
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.callItemNo!=null"> AND CALL_ITEM_NO=#{ew.entity.callItemNo}</if>
+                    <if test="ew.entity.shopOrder!=null"> AND SHOP_ORDER=#{ew.entity.shopOrder}</if>
+                    <if test="ew.entity.sfc!=null"> AND SFC=#{ew.entity.sfc}</if>
+                    <if test="ew.entity.item!=null"> AND ITEM=#{ew.entity.item}</if>
+                    <if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
+                    <if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
+                    <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectObjs" resultType="Object">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_ISSUE_ITEM
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.callItemNo!=null"> AND CALL_ITEM_NO=#{ew.entity.callItemNo}</if>
+                    <if test="ew.entity.shopOrder!=null"> AND SHOP_ORDER=#{ew.entity.shopOrder}</if>
+                    <if test="ew.entity.sfc!=null"> AND SFC=#{ew.entity.sfc}</if>
+                    <if test="ew.entity.item!=null"> AND ITEM=#{ew.entity.item}</if>
+                    <if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
+                    <if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
+                    <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectPage" resultMap="BaseResultMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_ISSUE_ITEM
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.callItemNo!=null"> AND CALL_ITEM_NO=#{ew.entity.callItemNo}</if>
+                    <if test="ew.entity.shopOrder!=null"> AND SHOP_ORDER=#{ew.entity.shopOrder}</if>
+                    <if test="ew.entity.sfc!=null"> AND SFC=#{ew.entity.sfc}</if>
+                    <if test="ew.entity.item!=null"> AND ITEM=#{ew.entity.item}</if>
+                    <if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
+                    <if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
+                    <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectMapsPage" resultType="HashMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_ISSUE_ITEM
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.callItemNo!=null"> AND CALL_ITEM_NO=#{ew.entity.callItemNo}</if>
+                    <if test="ew.entity.shopOrder!=null"> AND SHOP_ORDER=#{ew.entity.shopOrder}</if>
+                    <if test="ew.entity.sfc!=null"> AND SFC=#{ew.entity.sfc}</if>
+                    <if test="ew.entity.item!=null"> AND ITEM=#{ew.entity.item}</if>
+                    <if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
+                    <if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
+                    <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <insert id="insert" parameterType="com.foreverwin.mesnac.dispatch.model.IssueItem">
+        INSERT INTO Z_ISSUE_ITEM
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            HANDLE,
+            <if test="site!=null">SITE,</if>
+            <if test="callItemNo!=null">CALL_ITEM_NO,</if>
+            <if test="shopOrder!=null">SHOP_ORDER,</if>
+            <if test="sfc!=null">SFC,</if>
+            <if test="item!=null">ITEM,</if>
+            <if test="inventory!=null">INVENTORY,</if>
+            <if test="qty!=null">QTY,</if>
+            <if test="createUser!=null">CREATE_USER,</if>
+            <if test="createdDateTime!=null">CREATED_DATE_TIME,</if>
+            <if test="modifyUser!=null">MODIFY_USER,</if>
+            <if test="modifiedDateTime!=null">MODIFIED_DATE_TIME,</if>
+        </trim> VALUES
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            #{handle},
+            <if test="site!=null">#{site},</if>
+            <if test="callItemNo!=null">#{callItemNo},</if>
+            <if test="shopOrder!=null">#{shopOrder},</if>
+            <if test="sfc!=null">#{sfc},</if>
+            <if test="item!=null">#{item},</if>
+            <if test="inventory!=null">#{inventory},</if>
+            <if test="qty!=null">#{qty},</if>
+            <if test="createUser!=null">#{createUser},</if>
+            <if test="createdDateTime!=null">#{createdDateTime},</if>
+            <if test="modifyUser!=null">#{modifyUser},</if>
+            <if test="modifiedDateTime!=null">#{modifiedDateTime},</if>
+        </trim>
+    </insert>
+
+    <insert id="insertAllColumn" parameterType="com.foreverwin.mesnac.dispatch.model.IssueItem">
+        INSERT INTO Z_ISSUE_ITEM
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <include refid="Base_Column_List"></include>
+        </trim> VALUES
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            #{handle},
+            #{site},
+            #{callItemNo},
+            #{shopOrder},
+            #{sfc},
+            #{item},
+            #{inventory},
+            #{qty},
+            #{createUser},
+            #{createdDateTime},
+            #{modifyUser},
+            #{modifiedDateTime},
+        </trim>
+    </insert>
+
+
+
+
+
+
+    <update id="update">
+        UPDATE Z_ISSUE_ITEM <trim prefix="SET" suffixOverrides=",">
+        <if test="et.handle!=null">HANDLE=#{et.handle},</if>
+        <if test="et.site!=null">SITE=#{et.site},</if>
+        <if test="et.callItemNo!=null">CALL_ITEM_NO=#{et.callItemNo},</if>
+        <if test="et.shopOrder!=null">SHOP_ORDER=#{et.shopOrder},</if>
+        <if test="et.sfc!=null">SFC=#{et.sfc},</if>
+        <if test="et.item!=null">ITEM=#{et.item},</if>
+        <if test="et.inventory!=null">INVENTORY=#{et.inventory},</if>
+        <if test="et.qty!=null">QTY=#{et.qty},</if>
+        <if test="et.createUser!=null">CREATE_USER=#{et.createUser},</if>
+        <if test="et.createdDateTime!=null">CREATED_DATE_TIME=#{et.createdDateTime},</if>
+        <if test="et.modifyUser!=null">MODIFY_USER=#{et.modifyUser},</if>
+        <if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if>
+    </trim>
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    HANDLE=#{ew.entity.handle}
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.callItemNo!=null"> AND CALL_ITEM_NO=#{ew.entity.callItemNo}</if>
+                    <if test="ew.entity.shopOrder!=null"> AND SHOP_ORDER=#{ew.entity.shopOrder}</if>
+                    <if test="ew.entity.sfc!=null"> AND SFC=#{ew.entity.sfc}</if>
+                    <if test="ew.entity.item!=null"> AND ITEM=#{ew.entity.item}</if>
+                    <if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
+                    <if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
+                    <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </update>
+
+
+    <delete id="deleteByMap">
+        DELETE FROM Z_ISSUE_ITEM
+        <if test="cm!=null and !cm.isEmpty">
+            <where>
+                <foreach collection="cm.keys" item="k" separator="AND">
+                    <if test="cm[k] != null">
+                        ${k} = #{cm[${k}]}
+                    </if>
+                </foreach>
+            </where>
+        </if>
+    </delete>
+
+    <delete id="delete">
+        DELETE FROM Z_ISSUE_ITEM
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.callItemNo!=null"> AND CALL_ITEM_NO=#{ew.entity.callItemNo}</if>
+                    <if test="ew.entity.shopOrder!=null"> AND SHOP_ORDER=#{ew.entity.shopOrder}</if>
+                    <if test="ew.entity.sfc!=null"> AND SFC=#{ew.entity.sfc}</if>
+                    <if test="ew.entity.item!=null"> AND ITEM=#{ew.entity.item}</if>
+                    <if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
+                    <if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
+                    <if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
+                    <if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </delete>
+
+    <!-- BaseMapper标准查询/修改/删除 -->
+
+</mapper>

dispatch/src/main/resources/mapper/SfcDispatchMapper.xml

@@ -459,7 +459,7 @@
                     <if test="ew.entity.other5!=null"> AND OTHER_5=#{ew.entity.other5}</if>
                 </if>
                 <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
-                    ${ew.sqlSegment}
+                    and ${ew.sqlSegment}
                 </if>
             </if>
         </where>
@@ -1073,4 +1073,23 @@
         UPDATE Z_SFC_DISPATCH SET DISPATCH_STATUS = #{dispatchStatus}, MODIFY_USER = #{modifyUser}, MODIFIED_DATE_TIME = #{modifiedDateTime}
         WHERE SITE = #{site} AND DISPATCH_NO = #{dispatchNo}
     </update>
+
+    <select id="findResrceBySfc" resultType="com.foreverwin.mesnac.common.dto.SfcDispatchDto">
+        SELECT RESRCE
+        FROM Z_SFC_DISPATCH zsd
+        <where>
+            SITE = #{site}
+            <if test="sfcDispatch != null">
+                <if test="sfcDispatch.sfc != null and sfcDispatch.sfc != ''">
+                    AND SFC = #{sfcDispatch.sfc}
+                </if>
+            </if>
+            <if test="array != null">
+                AND DISPATCH_STATUS IN
+                <foreach open="(" item="item"  collection="array" separator="," close=")">
+                    UPPER(#{item})
+                </foreach>
+            </if>
+        </where>
+    </select>
 </mapper>

dispatch/src/main/resources/mapper/SurplusItemReturnMapper.xml

@@ -0,0 +1,444 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.foreverwin.mesnac.dispatch.mapper.SurplusItemReturnMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.foreverwin.mesnac.dispatch.model.SurplusItemReturn">
+        <id column="HANDLE" property="handle" />
+        <result column="SITE" property="site" />
+        <result column="INVENTORY" property="inventory" />
+        <result column="PARENT_INVENTORY" property="parentInventory" />
+        <result column="ITEM_BO" property="itemBo" />
+        <result column="LENGHT" property="lenght" />
+        <result column="WIDTH" property="width" />
+        <result column="QTY" property="qty" />
+        <result column="CREATE_USER_BO" property="createUserBo" />
+        <result column="CREATED_DATE_TIME" property="createdDateTime" />
+        <result column="UPDATE_USER_BO" property="updateUserBo" />
+        <result column="UPDATED_DATE_TIME" property="updatedDateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        HANDLE, SITE, INVENTORY, PARENT_INVENTORY, ITEM_BO, LENGHT, WIDTH, QTY, CREATE_USER_BO, CREATED_DATE_TIME, UPDATE_USER_BO, UPDATED_DATE_TIME
+    </sql>
+
+    <!-- BaseMapper标准查询/修改/删除 -->
+    <select id="selectById" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"></include> FROM Z_SURPLUS_ITEM_RETURN WHERE HANDLE=#{handle}
+    </select>
+
+    <select id="selectByMap" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"></include>
+        FROM Z_SURPLUS_ITEM_RETURN
+        <if test="cm!=null and !cm.isEmpty">
+            <where>
+                <foreach collection="cm.keys" item="k" separator="AND">
+                    <if test="cm[k] != null">
+                        ${k} = #{cm[${k}]}
+                    </if>
+                </foreach>
+            </where>
+        </if>
+    </select>
+
+    <select id="selectBatchIds" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"></include>
+        FROM Z_SURPLUS_ITEM_RETURN WHERE HANDLE IN (
+        <foreach item="item" index="index" collection="coll" separator=",">#{item}
+        </foreach>)
+    </select>
+
+    <select id="selectOne" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"></include> FROM Z_SURPLUS_ITEM_RETURN
+        <where>
+            <if test="ew.entity.handle!=null">
+              HANDLE=#{ew.handle}
+            </if>
+            <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+            <if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
+            <if test="ew.entity.parentInventory!=null"> AND PARENT_INVENTORY=#{ew.entity.parentInventory}</if>
+            <if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
+            <if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
+            <if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
+            <if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
+            <if test="ew.entity.createUserBo!=null"> AND CREATE_USER_BO=#{ew.entity.createUserBo}</if>
+            <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+            <if test="ew.entity.updateUserBo!=null"> AND UPDATE_USER_BO=#{ew.entity.updateUserBo}</if>
+            <if test="ew.entity.updatedDateTime!=null"> AND UPDATED_DATE_TIME=#{ew.entity.updatedDateTime}</if>
+        </where>
+    </select>
+
+    <select id="selectCount" resultType="Integer">
+        SELECT COUNT(1) FROM Z_SURPLUS_ITEM_RETURN
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                <if test="ew.entity.handle!=null">
+                    HANDLE=#{ew.entity.handle}
+                </if>
+                <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                <if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
+                <if test="ew.entity.parentInventory!=null"> AND PARENT_INVENTORY=#{ew.entity.parentInventory}</if>
+                <if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
+                <if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
+                <if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
+                <if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
+                <if test="ew.entity.createUserBo!=null"> AND CREATE_USER_BO=#{ew.entity.createUserBo}</if>
+                <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                <if test="ew.entity.updateUserBo!=null"> AND UPDATE_USER_BO=#{ew.entity.updateUserBo}</if>
+                <if test="ew.entity.updatedDateTime!=null"> AND UPDATED_DATE_TIME=#{ew.entity.updatedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectList" resultMap="BaseResultMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_SURPLUS_ITEM_RETURN
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
+                    <if test="ew.entity.parentInventory!=null"> AND PARENT_INVENTORY=#{ew.entity.parentInventory}</if>
+                    <if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
+                    <if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
+                    <if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
+                    <if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
+                    <if test="ew.entity.createUserBo!=null"> AND CREATE_USER_BO=#{ew.entity.createUserBo}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.updateUserBo!=null"> AND UPDATE_USER_BO=#{ew.entity.updateUserBo}</if>
+                    <if test="ew.entity.updatedDateTime!=null"> AND UPDATED_DATE_TIME=#{ew.entity.updatedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectMaps" resultType="HashMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_SURPLUS_ITEM_RETURN
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
+                    <if test="ew.entity.parentInventory!=null"> AND PARENT_INVENTORY=#{ew.entity.parentInventory}</if>
+                    <if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
+                    <if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
+                    <if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
+                    <if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
+                    <if test="ew.entity.createUserBo!=null"> AND CREATE_USER_BO=#{ew.entity.createUserBo}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.updateUserBo!=null"> AND UPDATE_USER_BO=#{ew.entity.updateUserBo}</if>
+                    <if test="ew.entity.updatedDateTime!=null"> AND UPDATED_DATE_TIME=#{ew.entity.updatedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectObjs" resultType="Object">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_SURPLUS_ITEM_RETURN
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
+                    <if test="ew.entity.parentInventory!=null"> AND PARENT_INVENTORY=#{ew.entity.parentInventory}</if>
+                    <if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
+                    <if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
+                    <if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
+                    <if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
+                    <if test="ew.entity.createUserBo!=null"> AND CREATE_USER_BO=#{ew.entity.createUserBo}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.updateUserBo!=null"> AND UPDATE_USER_BO=#{ew.entity.updateUserBo}</if>
+                    <if test="ew.entity.updatedDateTime!=null"> AND UPDATED_DATE_TIME=#{ew.entity.updatedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectPage" resultMap="BaseResultMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_SURPLUS_ITEM_RETURN
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
+                    <if test="ew.entity.parentInventory!=null"> AND PARENT_INVENTORY=#{ew.entity.parentInventory}</if>
+                    <if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
+                    <if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
+                    <if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
+                    <if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
+                    <if test="ew.entity.createUserBo!=null"> AND CREATE_USER_BO=#{ew.entity.createUserBo}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.updateUserBo!=null"> AND UPDATE_USER_BO=#{ew.entity.updateUserBo}</if>
+                    <if test="ew.entity.updatedDateTime!=null"> AND UPDATED_DATE_TIME=#{ew.entity.updatedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <select id="selectMapsPage" resultType="HashMap">
+        SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_SURPLUS_ITEM_RETURN
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
+                    <if test="ew.entity.parentInventory!=null"> AND PARENT_INVENTORY=#{ew.entity.parentInventory}</if>
+                    <if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
+                    <if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
+                    <if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
+                    <if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
+                    <if test="ew.entity.createUserBo!=null"> AND CREATE_USER_BO=#{ew.entity.createUserBo}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.updateUserBo!=null"> AND UPDATE_USER_BO=#{ew.entity.updateUserBo}</if>
+                    <if test="ew.entity.updatedDateTime!=null"> AND UPDATED_DATE_TIME=#{ew.entity.updatedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </select>
+
+    <insert id="insert" parameterType="com.foreverwin.mesnac.dispatch.model.SurplusItemReturn">
+        INSERT INTO Z_SURPLUS_ITEM_RETURN
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            HANDLE,
+            <if test="site!=null">SITE,</if>
+            <if test="inventory!=null">INVENTORY,</if>
+            <if test="parentInventory!=null">PARENT_INVENTORY,</if>
+            <if test="itemBo!=null">ITEM_BO,</if>
+            <if test="lenght!=null">LENGHT,</if>
+            <if test="width!=null">WIDTH,</if>
+            <if test="qty!=null">QTY,</if>
+            <if test="createUserBo!=null">CREATE_USER_BO,</if>
+            <if test="createdDateTime!=null">CREATED_DATE_TIME,</if>
+            <if test="updateUserBo!=null">UPDATE_USER_BO,</if>
+            <if test="updatedDateTime!=null">UPDATED_DATE_TIME,</if>
+        </trim> VALUES
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            #{handle},
+            <if test="site!=null">#{site},</if>
+            <if test="inventory!=null">#{inventory},</if>
+            <if test="parentInventory!=null">#{parentInventory},</if>
+            <if test="itemBo!=null">#{itemBo},</if>
+            <if test="lenght!=null">#{lenght},</if>
+            <if test="width!=null">#{width},</if>
+            <if test="qty!=null">#{qty},</if>
+            <if test="createUserBo!=null">#{createUserBo},</if>
+            <if test="createdDateTime!=null">#{createdDateTime},</if>
+            <if test="updateUserBo!=null">#{updateUserBo},</if>
+            <if test="updatedDateTime!=null">#{updatedDateTime},</if>
+        </trim>
+    </insert>
+
+    <insert id="insertAllColumn" parameterType="com.foreverwin.mesnac.dispatch.model.SurplusItemReturn">
+        INSERT INTO Z_SURPLUS_ITEM_RETURN
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <include refid="Base_Column_List"></include>
+        </trim> VALUES
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            #{handle},
+            #{site},
+            #{inventory},
+            #{parentInventory},
+            #{itemBo},
+            #{lenght},
+            #{width},
+            #{qty},
+            #{createUserBo},
+            #{createdDateTime},
+            #{updateUserBo},
+            #{updatedDateTime},
+        </trim>
+    </insert>
+
+
+    <update id="updateById">
+        UPDATE Z_SURPLUS_ITEM_RETURN <trim prefix="SET" suffixOverrides=",">
+        <if test="et.site!=null">SITE=#{et.site},</if>
+        <if test="et.inventory!=null">INVENTORY=#{et.inventory},</if>
+        <if test="et.parentInventory!=null">PARENT_INVENTORY=#{et.parentInventory},</if>
+        <if test="et.itemBo!=null">ITEM_BO=#{et.itemBo},</if>
+        <if test="et.lenght!=null">LENGHT=#{et.lenght},</if>
+        <if test="et.width!=null">WIDTH=#{et.width},</if>
+        <if test="et.qty!=null">QTY=#{et.qty},</if>
+        <if test="et.createUserBo!=null">CREATE_USER_BO=#{et.createUserBo},</if>
+        <if test="et.createdDateTime!=null">CREATED_DATE_TIME=#{et.createdDateTime},</if>
+        <if test="et.updateUserBo!=null">UPDATE_USER_BO=#{et.updateUserBo},</if>
+        <if test="et.updatedDateTime!=null">UPDATED_DATE_TIME=#{et.updatedDateTime},</if>
+        </trim> WHERE HANDLE=#{et.handle} <if test="et instanceof java.util.Map"><if test="et.MP_OPTLOCK_VERSION_ORIGINAL!=null">and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}</if></if>
+    </update>
+
+
+    <update id="updateAllColumnById">
+        UPDATE Z_SURPLUS_ITEM_RETURN <trim prefix="SET" suffixOverrides=",">
+        SITE=#{et.site},
+        INVENTORY=#{et.inventory},
+        PARENT_INVENTORY=#{et.parentInventory},
+        ITEM_BO=#{et.itemBo},
+        LENGHT=#{et.lenght},
+        WIDTH=#{et.width},
+        QTY=#{et.qty},
+        CREATE_USER_BO=#{et.createUserBo},
+        CREATED_DATE_TIME=#{et.createdDateTime},
+        UPDATE_USER_BO=#{et.updateUserBo},
+        UPDATED_DATE_TIME=#{et.updatedDateTime},
+     </trim> WHERE HANDLE=#{et.handle} <if test="et instanceof java.util.Map"><if test="et.MP_OPTLOCK_VERSION_ORIGINAL!=null">and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}</if></if>
+    </update>
+
+
+    <update id="update">
+        UPDATE Z_SURPLUS_ITEM_RETURN <trim prefix="SET" suffixOverrides=",">
+        <if test="et.site!=null">SITE=#{et.site},</if>
+        <if test="et.inventory!=null">INVENTORY=#{et.inventory},</if>
+        <if test="et.parentInventory!=null">PARENT_INVENTORY=#{et.parentInventory},</if>
+        <if test="et.itemBo!=null">ITEM_BO=#{et.itemBo},</if>
+        <if test="et.lenght!=null">LENGHT=#{et.lenght},</if>
+        <if test="et.width!=null">WIDTH=#{et.width},</if>
+        <if test="et.qty!=null">QTY=#{et.qty},</if>
+        <if test="et.createUserBo!=null">CREATE_USER_BO=#{et.createUserBo},</if>
+        <if test="et.createdDateTime!=null">CREATED_DATE_TIME=#{et.createdDateTime},</if>
+        <if test="et.updateUserBo!=null">UPDATE_USER_BO=#{et.updateUserBo},</if>
+        <if test="et.updatedDateTime!=null">UPDATED_DATE_TIME=#{et.updatedDateTime},</if>
+    </trim>
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    HANDLE=#{ew.entity.handle}
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
+                    <if test="ew.entity.parentInventory!=null"> AND PARENT_INVENTORY=#{ew.entity.parentInventory}</if>
+                    <if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
+                    <if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
+                    <if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
+                    <if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
+                    <if test="ew.entity.createUserBo!=null"> AND CREATE_USER_BO=#{ew.entity.createUserBo}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.updateUserBo!=null"> AND UPDATE_USER_BO=#{ew.entity.updateUserBo}</if>
+                    <if test="ew.entity.updatedDateTime!=null"> AND UPDATED_DATE_TIME=#{ew.entity.updatedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </update>
+
+    <delete id="deleteById">
+        DELETE FROM Z_SURPLUS_ITEM_RETURN WHERE HANDLE=#{handle}
+    </delete>
+
+    <delete id="deleteByMap">
+        DELETE FROM Z_SURPLUS_ITEM_RETURN
+        <if test="cm!=null and !cm.isEmpty">
+            <where>
+                <foreach collection="cm.keys" item="k" separator="AND">
+                    <if test="cm[k] != null">
+                        ${k} = #{cm[${k}]}
+                    </if>
+                </foreach>
+            </where>
+        </if>
+    </delete>
+
+    <delete id="delete">
+        DELETE FROM Z_SURPLUS_ITEM_RETURN
+        <where>
+            <if test="ew!=null">
+                <if test="ew.entity!=null">
+                    <if test="ew.entity.handle!=null">
+                        HANDLE=#{ew.entity.handle}
+                    </if>
+                    <if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
+                    <if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
+                    <if test="ew.entity.parentInventory!=null"> AND PARENT_INVENTORY=#{ew.entity.parentInventory}</if>
+                    <if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
+                    <if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
+                    <if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
+                    <if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
+                    <if test="ew.entity.createUserBo!=null"> AND CREATE_USER_BO=#{ew.entity.createUserBo}</if>
+                    <if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
+                    <if test="ew.entity.updateUserBo!=null"> AND UPDATE_USER_BO=#{ew.entity.updateUserBo}</if>
+                    <if test="ew.entity.updatedDateTime!=null"> AND UPDATED_DATE_TIME=#{ew.entity.updatedDateTime}</if>
+                </if>
+                <if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
+                    ${ew.sqlSegment}
+                </if>
+            </if>
+        </where>
+        <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
+            ${ew.sqlSegment}
+        </if>
+    </delete>
+
+    <delete id="deleteBatchIds">
+        DELETE FROM Z_SURPLUS_ITEM_RETURN WHERE HANDLE IN (
+        <foreach item="item" index="index" collection="coll" separator=",">#{item}
+        </foreach>)
+    </delete>
+    <!-- BaseMapper标准查询/修改/删除 -->
+
+
+    <select id="selectInventoryData" resultType="hashMap">
+        SELECT IV.HANDLE, IV.SITE, IV.INVENTORY_ID, IV.QTY_ON_HAND, IM.ITEM, IT.DESCRIPTION, CS1.VALUE PER_METER, CS2.VALUE PER_SQUARE_METER
+        FROM INVENTORY IV
+        INNER JOIN ITEM IM ON IM.HANDLE = IV.ITEM_BO
+        LEFT JOIN ITEM_T IT ON IT.ITEM_BO = IM.HANDLE AND IT.LOCALE = 'zh'
+        LEFT JOIN CUSTOM_FIELDS CS1 ON CS1.HANDLE = IM.HANDLE AND CS1.ATTRIBUTE = 'PER_METER'
+        LEFT JOIN CUSTOM_FIELDS CS2 ON CS2.HANDLE = IM.HANDLE AND CS2.ATTRIBUTE = 'PER_SQUARE_METER'
+        WHERE IV.HANDLE = #{inventoryBo}
+    </select>
+</mapper>

generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java

@@ -33,9 +33,9 @@ public class GeneratorApplication {
         dataSourceConfig.setTypeConvert( new OracleTypeConvert() );
         MpGenerator mpGenerator = mpGeneratorBuilder.dataSourceConfig(dataSourceConfig)
                 .tablePrefix( "APS_", "DS_", "Z_" )
-                .packageName( "com.foreverwin.mesnac.equip" )
-                .tables("Z_RESOURCE_INSPECT_TASK_SPARE")
-                .author("pavel.Liu")
+                .packageName( "com.foreverwin.mesnac.dispatch" )
+                .tables("Z_SURPLUS_ITEM_RETURN")
+                .author("Leon.L")
                 .uiAppId("com.foreverwin.me")
                 .uiPackage("com.foreverwin.me.migration")
                 .build();

integration/src/main/java/com/foreverwin/mesnac/integration/dto/ItemBatchDto.java

@@ -7,27 +7,35 @@ import javax.xml.bind.annotation.XmlType;
 
 @XmlAccessorType( XmlAccessType.FIELD )
 @XmlType(name = "ItemBatchDto", propOrder = {
+        "FACTORY",
         "RSNUM",
         "ITEM",
         "SPEC",
         "TEXTURE",
-        "BATCH",
-        "SUPPLIER"
+        "BATCH"
 })
 public class ItemBatchDto {
 
+    @XmlElement(name = "FACTORY")
+    private String FACTORY;
     @XmlElement(name = "RSNUM")
     private String RSNUM;
-    @XmlElement(name = "ITEM", required = true)
+    @XmlElement(name = "ITEM")
     private String ITEM;
     @XmlElement(name = "SPEC")
     private String SPEC;
     @XmlElement(name = "TEXTURE")
     private String TEXTURE;
-    @XmlElement(name = "BATCH", required = true)
+    @XmlElement(name = "BATCH")
     private String BATCH;
-    @XmlElement(name = "SUPPLIER", required = true)
-    private String SUPPLIER;
+
+    public String getFACTORY() {
+        return FACTORY;
+    }
+
+    public void setFACTORY(String FACTORY) {
+        this.FACTORY = FACTORY;
+    }
 
     public String getRSNUM() {
         return RSNUM;
@@ -69,23 +77,15 @@ public class ItemBatchDto {
         this.BATCH = BATCH;
     }
 
-    public String getSUPPLIER() {
-        return SUPPLIER;
-    }
-
-    public void setSUPPLIER(String SUPPLIER) {
-        this.SUPPLIER = SUPPLIER;
-    }
-
     @Override
     public String toString() {
         return "ItemBatchDto{" +
-                "RSNUM='" + RSNUM + '\'' +
+                "FACTORY='" + FACTORY + '\'' +
+                ", RSNUM='" + RSNUM + '\'' +
                 ", ITEM='" + ITEM + '\'' +
                 ", SPEC='" + SPEC + '\'' +
                 ", TEXTURE='" + TEXTURE + '\'' +
                 ", BATCH='" + BATCH + '\'' +
-                ", SUPPLIER='" + SUPPLIER + '\'' +
                 '}';
     }
 }

integration/src/main/java/com/foreverwin/mesnac/integration/dto/ItemBatchReceiveRequest.java

@@ -17,23 +17,23 @@ import java.util.List;
         "TRANID",
         "DATE_TIME",
         "SITE",
-        "FACTORY",
+        "SUPPLIER",
         "PURCHASE_ORDER",
         "PURCHASE_ORDER_LIST"
 })
 public class ItemBatchReceiveRequest {
 
-    @XmlElement(name = "TRANID", required = true)
+    @XmlElement(name = "TRANID")
     private String TRANID;
-    @XmlElement(name = "DATE_TIME", required = true)
+    @XmlElement(name = "DATE_TIME")
     private String DATE_TIME;
-    @XmlElement(name = "SITE", required = true)
+    @XmlElement(name = "SITE")
     private String SITE;
-    @XmlElement(name = "FACTORY")
-    private String FACTORY;
+    @XmlElement(name = "SUPPLIER")
+    private String SUPPLIER;
     @XmlElement(name = "PURCHASE_ORDER")
     private String PURCHASE_ORDER;
-    @XmlElement(name = "PURCHASE_ORDER_LIST", required = true)
+    @XmlElement(name = "PURCHASE_ORDER_LIST")
     private List<ItemBatchDto> PURCHASE_ORDER_LIST;
 
     public String getTRANID() {
@@ -60,12 +60,12 @@ public class ItemBatchReceiveRequest {
         this.SITE = SITE;
     }
 
-    public String getFACTORY() {
-        return FACTORY;
+    public String getSUPPLIER() {
+        return SUPPLIER;
     }
 
-    public void setFACTORY(String FACTORY) {
-        this.FACTORY = FACTORY;
+    public void setSUPPLIER(String SUPPLIER) {
+        this.SUPPLIER = SUPPLIER;
     }
 
     public String getPURCHASE_ORDER() {
@@ -90,7 +90,7 @@ public class ItemBatchReceiveRequest {
                 "TRANID='" + TRANID + '\'' +
                 ", DATE_TIME='" + DATE_TIME + '\'' +
                 ", SITE='" + SITE + '\'' +
-                ", FACTORY='" + FACTORY + '\'' +
+                ", SUPPLIER='" + SUPPLIER + '\'' +
                 ", PURCHASE_ORDER='" + PURCHASE_ORDER + '\'' +
                 ", PURCHASE_ORDER_LIST=" + PURCHASE_ORDER_LIST +
                 '}';

integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java

@@ -25,6 +25,7 @@ import com.sap.me.production.ChangeProductionServiceInterface;
 import com.sap.me.production.OperationPlacementTypeEnum;
 import com.visiprise.globalization.DateGlobalizationServiceInterface;
 import com.visiprise.globalization.GlobalizationService;
+import com.visiprise.globalization.util.DateTimeInterface;
 import com.visiprise.model.BOMType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.i18n.LocaleContextHolder;
@@ -180,11 +181,9 @@ public class InterfaceServiceImpl implements InterfaceService {
         }
         bomComponentDtoList.sort((a,b) -> Float.compare(a.getSEQ().floatValue(), b.getSEQ().floatValue()));
 
-        Boolean isChange = false;
         //查询工艺路线是否存在, 不存在版本默认为1.0，存在最大版本+1最为当前版本
         Bom bomModel = bomService.getMaxRevisionBom(site, bom);
         if (bomModel != null) {
-            isChange = true;
             Float currentRevision = new Float(bomModel.getRevision());
             revision = currentRevision + 1;
             bomBo = HandleEnum.BOM.getHandle(site, bom, revision.toString(), BOMType._H);
@@ -241,30 +240,6 @@ public class InterfaceServiceImpl implements InterfaceService {
         bomConfiguration.setBomComponentList(componentConfigurationList);
         //物料清单保存
         bomConfigurationService.createBOM(bomConfiguration);
-
-        //非BOM变更
-        if (!isChange) return;
-
-        //查询工单是否已下达，已下达则表示需要做变更
-        String shopOrderBo = HandleEnum.SHOP_ORDER.getHandle(site, shopOrder);
-        List<Sfc> sfcList = sfcService.getSfcListByShopOrderBo(shopOrderBo);
-        if (sfcList == null || sfcList.size() <= 0) {
-            return;
-        }
-
-        //如果工单已经开始生产，做更改生产操作
-        ChangeProductionRequest changeProductionRequest = new ChangeProductionRequest();
-
-        //变更内容
-        ChangeProductionContext changeProductionContext = new ChangeProductionContext();
-        changeProductionContext.setNewBom(bom);
-        changeProductionContext.setNewBomRevision(revision.toString());
-        changeProductionRequest.setChangeProductionContextType(changeProductionContext);
-
-        //变更注释
-        changeProductionRequest.setCommentsRequired(true);
-        changeProductionRequest.setComments("BOM变更，更改生产");
-        changeProductionService.changeProduction(changeProductionRequest);
     }
 
     @Override
@@ -293,11 +268,9 @@ public class InterfaceServiceImpl implements InterfaceService {
         String routerType = RouterType.SHOPORDER_SPECIFIC.value();
         String routerBo = HandleEnum.ROUTER.getHandle(site, router, routerType, revision.toString());
 
-        Boolean isChange = false;
         //查询工艺路线是否存在, 不存在版本默认为1.0，存在最大版本+1最为当前版本
         Router routerModel = routerService.getMaxRevisionRouter(site, router);
         if (routerModel != null) {
-            isChange = true;
             Float currentRevision = new Float(routerModel.getRevision());
             revision = currentRevision + 1;
             routerBo = HandleEnum.ROUTER.getHandle(site, router, routerType, revision.toString());
@@ -410,33 +383,6 @@ public class InterfaceServiceImpl implements InterfaceService {
         if (customFieldsList != null && customFieldsList.size() > 0) {
             customFieldsService.saveOrUpdateCustomFields(customFieldsList);
         }
-
-        //非工艺路线变更
-        if (!isChange) return;
-
-        //查询工单是否已下达，已下达则表示需要做变更
-        String shopOrderBo = HandleEnum.SHOP_ORDER.getHandle(site, shopOrder);
-        List<Sfc> sfcList = sfcService.getSfcListByShopOrderBo(shopOrderBo);
-        if (sfcList == null || sfcList.size() <= 0) {
-            return;
-        }
-
-        //如果工单已经开始生产，做更改生产操作
-        ChangeProductionRequest changeProductionRequest = new ChangeProductionRequest();
-
-        //变更内容
-        ChangeProductionContext changeProductionContext = new ChangeProductionContext();
-        changeProductionContext.setNewRouter(router);
-        changeProductionContext.setNewRouterRevision(revision.toString());
-        changeProductionRequest.setChangeProductionContextType(changeProductionContext);
-
-        //选择车间作业控制的工艺路线操作位置
-        changeProductionRequest.setOperationPlacementType(OperationPlacementTypeEnum.CURRENT_OPERATION);
-
-        //变更注释
-        changeProductionRequest.setCommentsRequired(true);
-        changeProductionRequest.setComments("工艺路线变更，更改生产");
-        changeProductionService.changeProduction(changeProductionRequest);
     }
 
     @Override
@@ -534,6 +480,9 @@ public class InterfaceServiceImpl implements InterfaceService {
             if (StringUtil.notBlank(completeDateTime)) {
                 shopOrderFull.setPlannedCompletionDate(dateService.createDateTime(simpleDateFormat.parse(completeDateTime).getTime()));
             }
+
+            //工单最后修改时间
+            shopOrderFull.setModifiedDateTime(dateService.createDateTime(shopOrderModel.getModifiedDateTime().getTime()));
             shopOrderMeService.updateShopOrder(shopOrderFull);
         }
 
@@ -604,12 +553,12 @@ public class InterfaceServiceImpl implements InterfaceService {
 
     @Override
     public void saveItemBatch(String site, ItemBatchReceiveRequest itemBatchReceiveRequest) {
-        String factory = itemBatchReceiveRequest.getFACTORY();
         List<ItemBatchDto> itemBatchDtoList = itemBatchReceiveRequest.getPURCHASE_ORDER_LIST();
         if (itemBatchDtoList == null || itemBatchDtoList.size() <= 0) {
             throw BusinessException.build("接口参数【PURCHASE_ORDER_LIST】不能为空");
         }
 
+        String supplier = itemBatchReceiveRequest.getSUPPLIER();
         LocalDateTime now = LocalDateTime.now();
         //循环处理 物料批次
         for (int i = 0; i < itemBatchDtoList.size(); i++) {
@@ -624,14 +573,10 @@ public class InterfaceServiceImpl implements InterfaceService {
             if (StringUtil.isBlank(item)) {
                 throw BusinessException.build("批次号不能为空");
             }
-            String supplier = itemBatchDto.getSUPPLIER();
+            String factory = itemBatchDto.getFACTORY();
 
             //查询物料和批次是否已经存在记录
-            ItemBatch queryBatch = new ItemBatch();
-            queryBatch.setBatch(site);
-            queryBatch.setItem(item);
-            queryBatch.setBatch(batch);
-            List<ItemBatch> itemBatchList = itemBatchService.selectList(queryBatch);
+            List<ItemBatch> itemBatchList = itemBatchService.findItemBatch(site, item, batch);
             if (itemBatchList != null && itemBatchList.size() > 0) {
                 //更新时间
                 ItemBatch itemBatch = itemBatchList.get(0);

meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/ShopOrderDto.java

@@ -23,6 +23,11 @@ public class ShopOrderDto extends ShopOrder {
      */
     private String productCategory;
 
+    /**
+     * 工作中心
+     */
+    private String workCenter;
+
     public String getWorkOrder() {
         return workOrder;
     }
@@ -46,4 +51,12 @@ public class ShopOrderDto extends ShopOrder {
     public void setProductCategory(String productCategory) {
         this.productCategory = productCategory;
     }
+
+    public String getWorkCenter() {
+        return workCenter;
+    }
+
+    public void setWorkCenter(String workCenter) {
+        this.workCenter = workCenter;
+    }
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ItemMapper.java

@@ -29,27 +29,4 @@ public interface ItemMapper extends BaseMapper<Item> {
     Item selectById(@Param("locale") String locale, @Param("handle") String handle);
 
     List<Item> selectListByCriteria(@Param("locale") String locale, @Param("ew") Wrapper<Item> wrapper);
-
-    Item getItemDescription(@Param("item") String item,@Param("locale")String locale, @Param("site") String site);
-    List<Item> getItemDetailList(@Param("site") String site,@Param("local")String local);
-
-    List<Item> selectItemControlList(@Param("locale") String locale, @Param("ew") Wrapper<Item> wrapper);
-
-    IPage<Item>getItemPageByProdVer(IPage page,@Param("site") String site,@Param("local")String local,@Param("query") String query);
-
-    IPage<Item> getBklasItem(IPage page,@Param("site")String site,@Param("local")String local,@Param("itemOrDesc")String itemOrDesc);
-
-    IPage<Item>getRawMaterial(IPage page,@Param("site")String site,@Param("local")String local,@Param("itemOrDesc")String itemOrDesc);
-
-    int checkItemUnit(@Param("unit")String unit,@Param("site")String site,@Param("item")String item);
-
-    Item selectItemBo(@Param("site") String site,@Param("item") String item);
-
-    Integer findItemNum(@Param("site") String site,@Param("item") String item);
-
-    List<Item> selectInnerOrder(@Param("site") String site, @Param("itemBo") String handle);
-
-    List<Item> selectItemSnp(@Param("site") String site,@Param("item") String item);
-
-    Item selectBatchReview(@Param("site") String site,@Param("item") String item);
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ShopOrder.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 
 /**
@@ -77,7 +79,7 @@ public class ShopOrder extends Model<ShopOrder> {
    @TableField("CREATED_DATE_TIME")
    private LocalDateTime createdDateTime;
    @TableField("MODIFIED_DATE_TIME")
-   private LocalDateTime modifiedDateTime;
+   private Date modifiedDateTime;
    @TableField("CUSTOMER")
    private String customer;
    @TableField("CUSTOMER_ORDER")
@@ -344,11 +346,11 @@ public class ShopOrder extends Model<ShopOrder> {
       this.createdDateTime = createdDateTime;
    }
 
-   public LocalDateTime getModifiedDateTime() {
+   public Date getModifiedDateTime() {
       return modifiedDateTime;
    }
 
-   public void setModifiedDateTime(LocalDateTime modifiedDateTime) {
+   public void setModifiedDateTime(Date modifiedDateTime) {
       this.modifiedDateTime = modifiedDateTime;
    }
 

meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ItemService.java

@@ -31,41 +31,11 @@ public interface ItemService extends IService<Item> {
 
     List<Item> selectList(Item item);
 
-    List<Item> selectItemWithDesc(Item item);
-
-    List<Item> selectItemWithDesc(QueryWrapper<Item> queryWrapper);
-
     List<Item> selectList(Wrapper<Item> queryWrapper);
 
-    List<Item> getItemDetailList();
-
-    Item getItemDescription(String item);
-
     String selectCurrent(String handle);
 
     Item selectCurrent(String site, String item);
 
-    List<Item> selectItemLabelControl(QueryWrapper<Item> queryWrapper);
-
-    IPage<Item>getItemPageByProdVer(IPage page, String query);
-
-    IPage<Item> getBklasItem(IPage page,String itemOrDesc);
-
-    IPage<Item>getRawMaterial(IPage page,String item);
-
-    Integer checkItemUnit(String unit,String site,String item);
-
-    /**
-     * 查询物料的描述
-     * @param item
-     * @param local
-     * @return
-     */
-    Item getItemDescription(String item, String local);
-
-    List<Item> selectInnerOrder(String site, String handle);
-
-    List<Item> selectItemSnp(String site, String item);
 
-    Item selectBatchReview(String site, String item);
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ItemServiceImpl.java

@@ -72,40 +72,6 @@ public class ItemServiceImpl extends ServiceImpl<ItemMapper, Item> implements It
     }
 
 
-    @Override
-    public List<Item> getItemDetailList() {
-      String site=  CommonMethods.getSite();
-      String local=LocaleContextHolder.getLocale().getLanguage();
-        return itemMapper.getItemDetailList(site,local);
-    }
-
-    @Override
-    public Item getItemDescription(String item) {
-        String site=  CommonMethods.getSite();
-        String local=LocaleContextHolder.getLocale().getLanguage();
-        return itemMapper.getItemDescription(item,local,site);
-    }
-
-
-    @Override
-    public List<Item> selectItemWithDesc(Item item) {
-        Locale locale = LocaleContextHolder.getLocale();
-        String site = CommonMethods.getSite();
-        QueryWrapper<Item> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(Item.SITE, site);
-        if( item.getItem() != null){
-            queryWrapper.like(Item.ITEM, item.getItem());
-        }
-        if(item.getDescription()!= null){
-            queryWrapper.like(Item.DESCRIPTION, item.getDescription());
-        }
-        return itemMapper.selectListByCriteria(locale.getLanguage(), queryWrapper);
-    }
-
-    @Override
-    public List<Item> selectItemWithDesc(QueryWrapper<Item> queryWrapper) {
-        return itemMapper.selectListByCriteria(LocaleContextHolder.getLocale().getLanguage(), queryWrapper);
-    }
     @Override
     public String selectCurrent(String handle){
         if(handle.endsWith("#")) {
@@ -129,61 +95,4 @@ public class ItemServiceImpl extends ServiceImpl<ItemMapper, Item> implements It
         //----------------------------------------------------------------------------------
         return resultLit != null && resultLit.size() > 0 ? resultLit.get(0) : null;
     }
-
-    @Override
-    public List<Item> selectItemLabelControl(QueryWrapper<Item> queryWrapper) {
-        return itemMapper.selectItemControlList(LocaleContextHolder.getLocale().getLanguage(), queryWrapper);
-    }
-
-
-
-    @Override
-    public IPage<Item> getItemPageByProdVer(IPage page,  String query) {
-        String site=CommonMethods.getSite();
-        String local=LocaleContextHolder.getLocale().getLanguage();
-
-        return itemMapper.getItemPageByProdVer(page,site,local,query);
-    }
-
-    @Override
-    public IPage<Item> getBklasItem(IPage page, String itemOrDesc) {
-        String site=CommonMethods.getSite();
-        String local=LocaleContextHolder.getLocale().getLanguage();
-        return  itemMapper.getBklasItem(page,site,local,itemOrDesc);
-    }
-
-
-    @Override
-    public IPage<Item> getRawMaterial(IPage page, String item) {
-          String local=LocaleContextHolder.getLocale().getLanguage();
-          String site=CommonMethods.getSite();
-        return itemMapper.getRawMaterial(page,site,local,item);
-    }
-
-    @Override
-    public Integer checkItemUnit(String unit, String site, String item) {
-        return itemMapper.checkItemUnit(unit,site,item);
-    }
-
-    @Override
-    public Item getItemDescription(String item, String local) {
-        String site = CommonMethods.getSite();
-        return itemMapper.getItemDescription(item, local, site);
-    }
-
-    @Override
-    public List<Item> selectInnerOrder(String site, String handle) {
-        return itemMapper.selectInnerOrder(site, handle);
-    }
-
-
-    @Override
-    public List<Item> selectItemSnp(String site, String item) {
-        return itemMapper.selectItemSnp(site, item);
-    }
-
-    @Override
-    public Item selectBatchReview(String site, String item) {
-        return itemMapper.selectBatchReview(site,item);
-    }
 }

meapi/src/main/resources/mapper/BomComponentMapper.xml

@@ -691,7 +691,7 @@
         WHERE PLANNED_WORK_CENTER_BO = #{workCenterBO}
     </select>
 
-    <select id = "getSfcBomComponent" resultMap="BaseResultMap">
+    <select id = "getSfcBomComponent" resultType="com.foreverwin.mesnac.meapi.dto.BomComponentDto">
         SELECT RS.STEP_ID,OP.OPERATION,BC.COMPONENT_GBO,TP.VALUE ACCESSORY_TYPE
    		FROM SFC SFC
    		JOIN SFC_ROUTING SRI ON SRI.SFC_BO =SFC.HANDLE

meapi/src/main/resources/mapper/CustomFieldsMapper.xml

@@ -296,5 +296,8 @@
     </select>
 
     <!-- BaseMapper标准查询/修改/删除 -->
-
+    <select id="selectCustomFieldsValue" resultType="java.lang.String">
+        SELECT "VALUE"  FROM CUSTOM_FIELDS
+        WHERE HANDLE = #{handle} AND ATTRIBUTE = #{attribute}
+    </select>
 </mapper>

meapi/src/main/resources/mapper/ItemMapper.xml

@@ -74,7 +74,7 @@
     </sql>
 
     <sql id="Full_Column_List">
-        I.HANDLE, I.CHANGE_STAMP, I.SITE, I.ITEM, IT.DESCRIPTION, I.STATUS_BO, I.ITEM_TYPE, I.ERP_GTIN, I.AIN_MODEL_EXTERNAL_ID, I.EFF_START_SEQ, I.EFF_END_SEQ, I.LOT_SIZE, I.QUANTITY_RESTRICTION, I.ROUTER_BO, I.BOM_BO, I.COMPONENT_GROUP_BO, I.ITEM_GROUP_BO, I.LAST_RELEASED_DATE, I.ASSY_DATA_TYPE_BO, I.PRE_ASSEMBLED, I.REVISION, I.CURRENT_REVISION, I.EFF_START_DATE, I.EFF_END_DATE, I.SELECTOR_ACTIVITY_BO, I.SELECTOR_NOTE, I.ASSIGN_SERIAL_AT_RELEASE, I.CREATED_DATE_TIME, I.MODIFIED_DATE_TIME, I.DRAWING_NAME, I.MAXIMUM_USAGE, I.USE_COMP_FROM_DRAWING, I.PANEL, I.REMOVAL_ASSY_DATA_TYPE_BO, I.INV_ASSY_DATA_TYPE_BO, I.ORIGINAL_STATUS_BO, I.QTY_MULTIPLIER, I.CREATE_TRACKABLE_SFC, I.MASK_GROUP_BO, I.TRANSFER_ITEM_GROUP_BO, I.UNIT_OF_MEASURE, I.HOLD_ID, I.COLLECT_PARENT_SERIAL, I.REQ_SERIAL_CHANGE, I.IS_COLLECTOR, I.INC_BATCH_NUMBER, I.TIME_SENSITIVE, I.MAX_SHELF_LIFE, I.MAX_SHELF_LIFE_UNITS, I.MAX_FLOOR_LIFE, I.MAX_FLOOR_LIFE_UNITS, I.NOTES, I.TB_COMP_TYPE, I.CONSUMPTION_TOL, I.ERP_BACKFLUSHING, I.STORAGE_LOCATION_BO, I.ERP_PUTAWAY_STORLOC, I.PRODUCTION_SUPPLY_AREA, I.USE_ORDER_ID_REL1
+        I.HANDLE, I.CHANGE_STAMP, I.SITE, I.ITEM, IT.DESCRIPTION, I.STATUS_BO, I.ITEM_TYPE, I.MATERIAL_TYPE, I.ERP_GTIN, I.AIN_MODEL_EXTERNAL_ID, I.EFF_START_SEQ, I.EFF_END_SEQ, I.LOT_SIZE, I.QUANTITY_RESTRICTION, I.ROUTER_BO, I.BOM_BO, I.COMPONENT_GROUP_BO, I.ITEM_GROUP_BO, I.LAST_RELEASED_DATE, I.ASSY_DATA_TYPE_BO, I.PRE_ASSEMBLED, I.REVISION, I.CURRENT_REVISION, I.EFF_START_DATE, I.EFF_END_DATE, I.SELECTOR_ACTIVITY_BO, I.SELECTOR_NOTE, I.ASSIGN_SERIAL_AT_RELEASE, I.CREATED_DATE_TIME, I.MODIFIED_DATE_TIME, I.DRAWING_NAME, I.MAXIMUM_USAGE, I.USE_COMP_FROM_DRAWING, I.PANEL, I.REMOVAL_ASSY_DATA_TYPE_BO, I.INV_ASSY_DATA_TYPE_BO, I.ORIGINAL_STATUS_BO, I.QTY_MULTIPLIER, I.CREATE_TRACKABLE_SFC, I.MASK_GROUP_BO, I.TRANSFER_ITEM_GROUP_BO, I.UNIT_OF_MEASURE, I.HOLD_ID, I.COLLECT_PARENT_SERIAL, I.REQ_SERIAL_CHANGE, I.IS_COLLECTOR, I.INC_BATCH_NUMBER, I.TIME_SENSITIVE, I.MAX_SHELF_LIFE, I.MAX_SHELF_LIFE_UNITS, I.MAX_FLOOR_LIFE, I.MAX_FLOOR_LIFE_UNITS, I.NOTES, I.TB_COMP_TYPE, I.CONSUMPTION_TOL, I.ERP_BACKFLUSHING, I.STORAGE_LOCATION_BO, I.ERP_PUTAWAY_STORLOC, I.PRODUCTION_SUPPLY_AREA, I.USE_ORDER_ID_REL1
     </sql>
     <!-- BaseMapper标准查询/修改/删除 -->
 
@@ -993,6 +993,7 @@
             ${ew.sqlSegment}
         </if>
     </delete>
+    <!-- BaseMapper标准查询/修改/删除 -->
 
     <select id="selectListByCriteria" resultMap="BaseResultMap">
         select * from (
@@ -1005,5 +1006,4 @@
         </if>
         </where>
     </select>
-
 </mapper>

meapi/src/main/resources/mapper/SfcMapper.xml

@@ -666,7 +666,7 @@
 
     <select id="pageByResrce" resultMap="FullResultMap">
         SELECT S.SFC,S.QTY,IT.DESCRIPTION ITEM_DESCRIPTION FROM SFC S
-        LEFT JOIN ITEM_T IT ON S.ITEM_BO=IT.HANDLE AND IT.LOCALE=#{locale}
+        LEFT JOIN ITEM_T IT ON S.ITEM_BO=IT.ITEM_BO AND IT.LOCALE=#{locale}
         JOIN Z_SFC_DISPATCH zsd ON S.SFC=zsd.SFC AND S.SITE=zsd.SITE
         JOIN Z_PROD_READY_TASK zprt ON ZPRT.SFC_DISPATCH_BO=zsd.HANDLE
         WHERE S.SITE=#{ew.entity.site}  AND ZSD.RESRCE=#{ew.entity.resrce}  AND ZSD.DISPATCH_STATUS!='CANCEL'

meapi/src/main/resources/mapper/ShopOrderMapper.xml

@@ -65,6 +65,7 @@
         <result column="WORK_ORDER" property="workOrder" />
         <result column="ITEM_NUMBER" property="itemNumber"/>
         <result column="PRODUCT_CATEGORY" property="productCategory"/>
+        <result column="WORK_CENTER" property="workCenter"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -1008,11 +1009,12 @@
 
     <!--根据工单找出工作令号，项目号，产品类别-->
     <select id="findByShopOrderBo" resultType="com.foreverwin.mesnac.meapi.dto.ShopOrderDto">
-        SELECT WO.VALUE WORK_ORDER,ITEM.VALUE ITEM_NUMBER,PC.VALUE PRODUCT_CATEGORY
+        SELECT WO.VALUE WORK_ORDER,ITEM.VALUE ITEM_NUMBER,PC.VALUE PRODUCT_CATEGORY,WC.WORK_CENTER
         FROM SHOP_ORDER SO
         LEFT JOIN CUSTOM_FIELDS WO ON WO.HANDLE = SO.HANDLE AND WO."ATTRIBUTE" = 'WORK_ORDER'
         LEFT JOIN CUSTOM_FIELDS ITEM ON ITEM.HANDLE = SO.HANDLE AND ITEM."ATTRIBUTE" = 'ITEM_NUMBER'
         LEFT JOIN CUSTOM_FIELDS PC ON PC.HANDLE = SO.HANDLE AND PC."ATTRIBUTE" = 'PRODUCT_CATEGORY'
+        LEFT JOIN WORK_CENTER WC ON WC.HANDLE  = SO.PLANNED_WORK_CENTER_BO
         WHERE SO.HANDLE = #{handle}
     </select>
 </mapper>

pom.xml

@@ -52,6 +52,12 @@
                 </exclusions>
             </dependency>
 
+            <dependency>
+                <groupId>commons-net</groupId>
+                <artifactId>commons-net</artifactId>
+                <version>3.1</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-tomcat</artifactId>

production/src/main/java/com/foreverwin/mesnac/production/controller/LoadInventoryController.java

@@ -3,6 +3,7 @@ package com.foreverwin.mesnac.production.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.foreverwin.mesnac.meapi.dto.WorkCenterDto;
+import com.foreverwin.mesnac.production.dto.LoadInventoryDto;
 import com.foreverwin.mesnac.production.model.LoadInventory;
 import com.foreverwin.mesnac.production.service.LoadInventoryService;
 import com.foreverwin.modular.core.util.FrontPage;
@@ -11,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  *
@@ -32,21 +34,32 @@ public class LoadInventoryController {
     @ResponseBody
     @GetMapping("/loadList")
     public R getLoadList(WorkCenterDto workCenterDto){
-        List<LoadInventory> result;
+        Map<String, Object> result;
         result = loadInventoryService.getLoadInventoryList(workCenterDto);
         return R.ok(result);
     }
+
     /**
-     * 查询所有数据
+     * 上料
      *
      * @return
      */
     @ResponseBody
     @GetMapping("/loadInventory")
     public R loadInventory(LoadInventory loadInventory){
-        List<LoadInventory> result;
-        result = loadInventoryService.loadInventory(loadInventory);
-        return R.ok(result);
+        loadInventoryService.loadInventory(loadInventory);
+        return R.ok("上料成功");
+    }
+    /**
+     * 卸料
+     *
+     * @return
+     */
+    @ResponseBody
+    @PostMapping("/unLoadInventory")
+    public R loadInventory(@RequestBody List<LoadInventoryDto> inventoryDtoList){
+        loadInventoryService.unLoadInventory(inventoryDtoList);
+        return R.ok();
     }
 
     /**

production/src/main/java/com/foreverwin/mesnac/production/dto/LoadInventoryDto.java

@@ -0,0 +1,42 @@
+package com.foreverwin.mesnac.production.dto;
+
+import com.foreverwin.mesnac.production.model.LoadInventory;
+
+public class LoadInventoryDto extends LoadInventory {
+    private String dwgNo;
+    private String itemDesc;
+    private String textture;
+    private String matSpec;
+
+    public String getDwgNo() {
+        return dwgNo;
+    }
+
+    public void setDwgNo(String dwgNo) {
+        this.dwgNo = dwgNo;
+    }
+
+    public String getItemDesc() {
+        return itemDesc;
+    }
+
+    public void setItemDesc(String itemDesc) {
+        this.itemDesc = itemDesc;
+    }
+
+    public String getTextture() {
+        return textture;
+    }
+
+    public void setTextture(String textture) {
+        this.textture = textture;
+    }
+
+    public String getMatSpec() {
+        return matSpec;
+    }
+
+    public void setMatSpec(String matSpec) {
+        this.matSpec = matSpec;
+    }
+}

production/src/main/java/com/foreverwin/mesnac/production/mapper/LoadInventoryMapper.java

@@ -1,5 +1,6 @@
 package com.foreverwin.mesnac.production.mapper;
 
+import com.foreverwin.mesnac.production.dto.LoadInventoryDto;
 import com.foreverwin.mesnac.production.model.LoadInventory;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -18,5 +19,5 @@ import java.util.List;
 @Repository
 public interface LoadInventoryMapper extends BaseMapper<LoadInventory> {
 
-    List<LoadInventory> getLoadInventoryList(@Param("site") String site,@Param("resrce")  String resrce, @Param("language") String language);
+    List<LoadInventoryDto> getLoadInventoryList(@Param("site") String site, @Param("resrce")  String resrce, @Param("language") String language);
 }

production/src/main/java/com/foreverwin/mesnac/production/model/LoadInventory.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -53,12 +54,12 @@ public class LoadInventory extends Model<LoadInventory> {
      * 剩余数量
      */
    @TableField("QTY_ON_HAND")
-   private Double qtyOnHand;
+   private BigDecimal qtyOnHand;
     /**
      * 上料数量
      */
    @TableField("LOAD_QTY")
-   private Double loadQty;
+   private BigDecimal loadQty;
     /**
      * 创建人
      */
@@ -121,19 +122,19 @@ public class LoadInventory extends Model<LoadInventory> {
       this.item = item;
    }
 
-   public Double getQtyOnHand() {
+   public BigDecimal getQtyOnHand() {
       return qtyOnHand;
    }
 
-   public void setQtyOnHand(Double qtyOnHand) {
+   public void setQtyOnHand(BigDecimal qtyOnHand) {
       this.qtyOnHand = qtyOnHand;
    }
 
-   public Double getLoadQty() {
+   public BigDecimal getLoadQty() {
       return loadQty;
    }
 
-   public void setLoadQty(Double loadQty) {
+   public void setLoadQty(BigDecimal loadQty) {
       this.loadQty = loadQty;
    }
 

production/src/main/java/com/foreverwin/mesnac/production/model/LoadInventoryLog.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -58,12 +59,12 @@ public class LoadInventoryLog extends Model<LoadInventoryLog> {
      * 剩余数量
      */
    @TableField("QTY_ON_HAND")
-   private Double qtyOnHand;
+   private BigDecimal qtyOnHand;
     /**
      * 上料数量
      */
    @TableField("LOAD_QTY")
-   private Double loadQty;
+   private BigDecimal loadQty;
     /**
      * 创建人
      */
@@ -124,19 +125,19 @@ public class LoadInventoryLog extends Model<LoadInventoryLog> {
       this.actionCode = actionCode;
    }
 
-   public Double getQtyOnHand() {
+   public BigDecimal getQtyOnHand() {
       return qtyOnHand;
    }
 
-   public void setQtyOnHand(Double qtyOnHand) {
+   public void setQtyOnHand(BigDecimal qtyOnHand) {
       this.qtyOnHand = qtyOnHand;
    }
 
-   public Double getLoadQty() {
+   public BigDecimal getLoadQty() {
       return loadQty;
    }
 
-   public void setLoadQty(Double loadQty) {
+   public void setLoadQty(BigDecimal loadQty) {
       this.loadQty = loadQty;
    }
 

production/src/main/java/com/foreverwin/mesnac/production/service/LoadInventoryService.java

@@ -3,9 +3,11 @@ package com.foreverwin.mesnac.production.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.foreverwin.mesnac.meapi.dto.WorkCenterDto;
+import com.foreverwin.mesnac.production.dto.LoadInventoryDto;
 import com.foreverwin.mesnac.production.model.LoadInventory;
 import com.foreverwin.modular.core.util.FrontPage;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -27,7 +29,9 @@ public interface LoadInventoryService extends IService<LoadInventory> {
 
     List<LoadInventory> selectList(LoadInventory loadInventory);
 
-    List<LoadInventory> getLoadInventoryList(WorkCenterDto workCenterDto);
+    HashMap<String, Object> getLoadInventoryList(WorkCenterDto workCenterDto);
 
-    List<LoadInventory> loadInventory(LoadInventory loadInventory);
+    void loadInventory(LoadInventory loadInventory);
+
+    void unLoadInventory(List<LoadInventoryDto> inventoryDtoList);
 }

production/src/main/java/com/foreverwin/mesnac/production/service/impl/LoadInventoryServiceImpl.java

@@ -3,25 +3,36 @@ package com.foreverwin.mesnac.production.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.foreverwin.mesnac.common.constant.Constants;
 import com.foreverwin.mesnac.common.enums.HandleEnum;
 import com.foreverwin.mesnac.common.service.CommonService;
 import com.foreverwin.mesnac.common.util.StringUtil;
 import com.foreverwin.mesnac.meapi.dto.WorkCenterDto;
+import com.foreverwin.mesnac.meapi.model.Inventory;
 import com.foreverwin.mesnac.meapi.model.Resrce;
 import com.foreverwin.mesnac.meapi.service.InventoryService;
 import com.foreverwin.mesnac.meapi.service.ResrceService;
+import com.foreverwin.mesnac.production.dto.LoadInventoryDto;
 import com.foreverwin.mesnac.production.mapper.LoadInventoryMapper;
 import com.foreverwin.mesnac.production.model.LoadInventory;
+import com.foreverwin.mesnac.production.model.LoadInventoryLog;
+import com.foreverwin.mesnac.production.service.LoadInventoryLogService;
 import com.foreverwin.mesnac.production.service.LoadInventoryService;
 import com.foreverwin.modular.core.exception.BaseException;
 import com.foreverwin.modular.core.util.CommonMethods;
 import com.foreverwin.modular.core.util.FrontPage;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
+import java.util.UUID;
+
 /**
  * <p>
  * 上料表 服务实现类
@@ -42,6 +53,8 @@ public class LoadInventoryServiceImpl extends ServiceImpl<LoadInventoryMapper, L
     private InventoryService inventoryService;
     @Autowired
     private LoadInventoryMapper loadInventoryMapper;
+    @Autowired
+    private LoadInventoryLogService loadInventoryLogService;
 
     @Override
     public IPage<LoadInventory> selectPage(FrontPage<LoadInventory> frontPage, LoadInventory loadInventory) {
@@ -58,7 +71,7 @@ public class LoadInventoryServiceImpl extends ServiceImpl<LoadInventoryMapper, L
     }
 
     @Override
-    public List<LoadInventory> getLoadInventoryList(WorkCenterDto workCenterDto) {
+    public HashMap<String, Object> getLoadInventoryList(WorkCenterDto workCenterDto) {
         String site = CommonMethods.getSite();
         String resrce = workCenterDto.getResrce();
         String workCenter = workCenterDto.getWorkCenter();
@@ -75,19 +88,87 @@ public class LoadInventoryServiceImpl extends ServiceImpl<LoadInventoryMapper, L
         if (!workCenter.equals(StringUtil.trimHandle(workShopBo))) {
             throw new BaseException("资源 " + resrce + " 与车间不匹配");
         }
-        return loadInventoryMapper.getLoadInventoryList(site,resrce, LocaleContextHolder.getLocale().getLanguage());
+        String description = byId.getDescription();
+        List<LoadInventoryDto> loadInventoryList = loadInventoryMapper.getLoadInventoryList(site, resrce, LocaleContextHolder.getLocale().getLanguage());
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("resrceDesc",description);
+        map.put("loadInventoryList",loadInventoryList);
+
+        return map;
     }
 
     @Override
-    public List<LoadInventory> loadInventory(LoadInventory loadInventory) {
+    public void loadInventory(LoadInventory loadInventory) {
         String site = CommonMethods.getSite();
         String resrce = loadInventory.getResrce();
         String handle = HandleEnum.RESOURCE.getHandle(site, resrce);
         Resrce byId = resrceService.getById(handle);
+        String inventoryId = loadInventory.getInventoryId();
+        BigDecimal loadQty = loadInventory.getLoadQty();
         if (byId==null){
             throw new BaseException("设备"+resrce+"不存在");
         }
-        return null;
+        if (loadQty.doubleValue()<=0){
+            throw new BaseException("上料数量不能小于0");
+        }
+        Inventory inventory = inventoryService.getById(HandleEnum.INVENTORY.getHandle(site, inventoryId));
+        if (inventory==null){
+            throw new BaseException("库存"+inventoryId+"不存在");
+        }
+        if (inventory.getQtyOnHand().compareTo(loadQty)<0){
+            throw new BaseException("上料数量不能大于剩余数量"+inventory.getQtyOnHand());
+        }
+        BigDecimal remainQty = inventory.getQtyOnHand().subtract(loadQty);
+        //扣减库存
+        commonService.updateInventory(site,inventoryId,remainQty);
+        //保存上料数据
+        LocalDateTime now = LocalDateTime.now();
+        String user = CommonMethods.getUser();
+        loadInventory.setHandle(HandleEnum.LOAD_INVENTORY.getHandle(site, UUID.randomUUID().toString()));
+        loadInventory.setSite(site);
+        loadInventory.setResrce(resrce);
+        loadInventory.setItem(StringUtil.trimHandle(inventory.getItemBo()));
+        loadInventory.setQtyOnHand(loadInventory.getLoadQty());
+        loadInventory.setCreateUser(user);
+        loadInventory.setCreatedDateTime(now);
+        loadInventory.setModifyUser(user);
+        loadInventory.setModifiedDateTime(now);
+        save(loadInventory);
+        LoadInventoryLog loadInventoryLog=new LoadInventoryLog();
+        BeanUtils.copyProperties(loadInventory,loadInventoryLog);
+        loadInventoryLog.setActionCode(Constants.ACTION_CODE_LOAD);
+        loadInventoryLog.setHandle(UUID.randomUUID().toString());
+        loadInventoryLogService.save(loadInventoryLog);
+    }
+
+    @Override
+    public void unLoadInventory(List<LoadInventoryDto> inventoryDtoList) {
+        String site = CommonMethods.getSite();
+        String user = CommonMethods.getUser();
+
+        for (LoadInventoryDto loadInventoryDto: inventoryDtoList) {
+            String handle = loadInventoryDto.getHandle();
+            LoadInventory loadInventory = getById(handle);
+            String inventoryId = loadInventory.getInventoryId();
+            if(loadInventory==null){
+                throw new BaseException("未找到上料记录");
+            }
+            Inventory inventory = inventoryService.getById(HandleEnum.INVENTORY.getHandle(site, inventoryId));
+            if (inventory==null){
+                throw new BaseException("库存"+inventoryId+"不存在");
+            }
+            //增加库存
+            commonService.updateInventory(site,inventoryId,inventory.getQtyOnHand().add(loadInventory.getQtyOnHand()));
+            //删除卸料数据
+            removeById(handle);
+            LoadInventoryLog loadInventoryLog=new LoadInventoryLog();
+            BeanUtils.copyProperties(loadInventory,loadInventoryLog);
+            loadInventoryLog.setActionCode(Constants.ACTION_CODE_UNLOAD);
+            loadInventoryLog.setCreatedDateTime(LocalDateTime.now());
+            loadInventoryLog.setCreateUser(user);
+            loadInventoryLog.setHandle(UUID.randomUUID().toString());
+            loadInventoryLogService.save(loadInventoryLog);
+        }
     }
 
 

production/src/main/resources/mapper/LoadInventoryMapper.xml

@@ -414,7 +414,13 @@
         </foreach>)
     </delete>
     <!-- BaseMapper标准查询/修改/删除 -->
-    <select id="getLoadInventoryList" resultMap="BaseResultMap">
-
+    <select id="getLoadInventoryList" resultType="com.foreverwin.mesnac.production.dto.LoadInventoryDto">
+        SELECT ZLI.*,it.DESCRIPTION ITEM_DESC,cf.VALUE DWG_NO,cf2.VALUE TEXTTURE,cf3.VALUE MAT_SPEC FROM  Z_LOAD_INVENTORY ZLI
+        JOIN ITEM I ON zli.SITE=I.SITE AND zli.ITEM=I.ITEM AND I.CURRENT_REVISION='true'
+        LEFT JOIN ITEM_T IT ON  I.HANDLE=IT.ITEM_BO AND  IT.LOCALE='zh'
+        LEFT JOIN CUSTOM_FIELDS cf ON  cf.HANDLE=IT.HANDLE AND  CF."ATTRIBUTE"='DWG_NO'
+        LEFT JOIN  CUSTOM_FIELDS cf2 ON  cf.HANDLE=IT.HANDLE AND  CF."ATTRIBUTE"='TEXTTURE'
+        LEFT JOIN  CUSTOM_FIELDS cf3 ON  cf.HANDLE=IT.HANDLE AND  CF."ATTRIBUTE"='MAT_SPEC'
+        WHERE ZLI.RESRCE=#{resrce} AND ZLI.SITE=#{site}  ORDER BY ZLI.CREATED_DATE_TIME
     </select>
 </mapper>

production/src/main/resources/mapper/SfcCrossMapper.xml

@@ -135,7 +135,7 @@ WHERE sfc.site = #{site} and
         WHEN SSTEP.QTY_IN_QUEUE > 0 THEN '排队中'
         ELSE '新建'  END STEP_STATUS
         FROM SFC S
-        LEFT JOIN ITEM_T IT ON S.ITEM_BO=IT.HANDLE AND IT.LOCALE='zh'
+        LEFT JOIN ITEM_T IT ON S.ITEM_BO=IT.ITEM_BO AND IT.LOCALE='zh'
         INNER JOIN SFC_ROUTING SRI ON S.HANDLE=SRI.SFC_BO
         INNER JOIN SFC_ROUTER SR ON SRI.HANDLE=SR.SFC_ROUTING_BO AND SR.IN_USE='true'
         INNER JOIN ROUTER_STEP RS ON  RS.ROUTER_BO=sr.ROUTER_BO
@@ -154,7 +154,7 @@ WHERE sfc.site = #{site} and
        		SELECT ZSD.sfc,ZSD.operation,IT.DESCRIPTION item_Description,ST.STATUS,s.qty,ZSD.DISPATCH_NO,ZSD.STEP_ID
        		FROM Z_SFC_DISPATCH ZSD
             JOIN SFC S ON ZSD.SFC=s.SFC AND  ZSD.SITE=s.SITE
-            LEFT JOIN ITEM_T IT ON S.ITEM_BO=IT.HANDLE AND  IT.LOCALE=#{locale}
+            LEFT JOIN ITEM_T IT ON S.ITEM_BO=IT.ITEM_BO AND  IT.LOCALE=#{locale}
             INNER JOIN STATUS ST ON ST.HANDLE = S.STATUS_BO
             WHERE  zsd.SITE=#{site}    AND zsd.DISPATCH_STATUS='START' AND ZSD.RESRCE=#{resrce}
     </select>