同步接口调整

src/main/java/com/topsunit/scanservice/ximai/controller/InvmbController.java

@@ -37,10 +37,10 @@ public class InvmbController {
         return invmbService.getInvmbList(criteria);
     }
 
-    @ApiOperation("工单MES更新标识")
+    @ApiOperation("物料MES更新标识")
     @PostMapping("/invmb/syncMark")
-    void syncMark(@RequestBody MoctaCriteria criteria){
-
+    public void syncMark(@RequestBody InvmbUpdateParams updateParams){
+        invmbService.syncMark(updateParams);
     }
 
 }

src/main/java/com/topsunit/scanservice/ximai/dto/InvmbCriteria.java

@@ -22,6 +22,8 @@ public class InvmbCriteria extends PageParams {
     private String mb002;
     @ApiModelProperty("核准状态")
     private String mb109;
+    @ApiModelProperty("同步标识状态")
+    private String neUdf08;
     @ApiModelProperty("创建日期")
     private String gtEqCreateDate;
     @ApiModelProperty("修改日期")

src/main/java/com/topsunit/scanservice/ximai/dto/InvmbUpdateParams.java

+package com.topsunit.scanservice.ximai.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>Title: InvmbUpdateParams</p>
+ * <p>Description: 品号基本信息档</p>
+ *
+ * @author chicheng.li
+ * @version V1.0
+ * @date 2024/10/24
+ */
+@Data
+public class InvmbUpdateParams {
+    /**
+     * 品号
+     */
+    @ApiModelProperty("品号")
+    private String mb001;
+
+    @ApiModelProperty("MES同步标识")
+    private String udf08;
+}

src/main/java/com/topsunit/scanservice/ximai/dto/MoctaCriteria.java

@@ -21,7 +21,7 @@ public class MoctaCriteria extends PageParams {
     @ApiModelProperty("审核码")
     private String ta013;
     @ApiModelProperty("同步标识")
-    private String udf07;
+    private String neUdf07;
     @ApiModelProperty("创建日期")
     private String gtEqCreateDate;
     @ApiModelProperty("修改日期")

src/main/java/com/topsunit/scanservice/ximai/dto/MoctaDto.java

@@ -189,6 +189,19 @@ public class MoctaDto {
     /*项目编号*/
     private String ta083;
 
+    @ApiModelProperty("客户图号")
+    private String udf02;
+    @ApiModelProperty("客户项目号")
+    private String udf03;
+    @ApiModelProperty("客户编号")
+    private String udf04;
+    @ApiModelProperty("客户简称")
+    private String udf05;
+    @ApiModelProperty("同步标识")
+    private String udf07;
+    @ApiModelProperty("内部图号")
+    private String udf08;
+
     @ApiModelProperty("创建时间")
     private String createDate;
 

src/main/java/com/topsunit/scanservice/ximai/entity/Invmb.java

@@ -62,4 +62,7 @@ public class Invmb extends EntityBase {
 
     @ApiModelProperty("备注")
     private String mb028;
+
+    @ApiModelProperty("MES同步标识")
+    private String udf08;
 }

src/main/java/com/topsunit/scanservice/ximai/entity/listeners/EntityChangeListener.java

@@ -54,7 +54,9 @@ public class EntityChangeListener implements ApplicationContextAware {
         if (object instanceof EntityBase) {
             EntityBase entity = (EntityBase) object;
             Cmsmv currentActor = getCurrentActor();
-            entity.setModifier(currentActor.getMv001());
+            if(currentActor!=null){
+                entity.setModifier(currentActor.getMv001());
+            }
             entity.setModiDate(DateUtil.currentDateTimeString());
             if (entity.getFlag() == null) {
                 entity.setFlag(1);

src/main/java/com/topsunit/scanservice/ximai/service/InvmbService.java

@@ -5,16 +5,15 @@ import com.topsunit.scanservice.ximai.dao.InvmcDao;
 import com.topsunit.scanservice.ximai.dao.InvmlDao;
 import com.topsunit.scanservice.ximai.dto.*;
 import com.topsunit.scanservice.ximai.dto.mapper.InvmbMapper;
-import com.topsunit.scanservice.ximai.entity.Copma;
-import com.topsunit.scanservice.ximai.entity.Invmb;
-import com.topsunit.scanservice.ximai.entity.Invmc;
-import com.topsunit.scanservice.ximai.entity.Invml;
+import com.topsunit.scanservice.ximai.entity.*;
 import jdk.nashorn.internal.parser.DateParser;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
@@ -78,6 +77,10 @@ public class InvmbService {
                     Predicate predicate = criteriaBuilder.like(root.get("mb109"), criteria.getMb109() + "%");
                     predicates.add(predicate);
                 }
+                if (StringUtils.isNotBlank(criteria.getNeUdf08())) {
+                    Predicate predicate = criteriaBuilder.notEqual(root.get("udf08"), criteria.getNeUdf08());
+                    predicates.add(predicate);
+                }
                 if (StringUtils.isNotBlank(criteria.getGtEqCreateDate())) {
                     Predicate predicate = criteriaBuilder.greaterThanOrEqualTo(root.get("createDate"), criteria.getGtEqCreateDate());
                     predicates.add(predicate);
@@ -119,4 +122,25 @@ public class InvmbService {
         List<Invml> list = invmlDao.findAll(query);
         return invmbMapper.toInvmlDto(list);
     }
+
+    /**
+     * 物料MES更新标识
+     * @param updateParams
+     */
+    @Transactional
+    public void syncMark(@RequestBody InvmbUpdateParams updateParams){
+        Specification<Invmb> query = new Specification<Invmb>() {
+            @Override
+            public Predicate toPredicate(Root<Invmb> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+                List<Predicate> predicates = new ArrayList<Predicate>();
+                predicates.add(criteriaBuilder.equal(root.get("mb001"), updateParams.getMb001()));
+                return criteriaQuery.where(predicates.toArray(new Predicate[0])).getRestriction();
+            }
+        };
+        List<Invmb> list = invmbDao.findAll(query);
+        list.forEach(s->{
+            s.setUdf08(updateParams.getUdf08());
+            invmbDao.save(s);
+        });
+    }
 }

src/main/java/com/topsunit/scanservice/ximai/service/MoctaService.java

@@ -14,6 +14,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.persistence.criteria.CriteriaBuilder;
@@ -73,8 +74,8 @@ public class MoctaService {
                     Predicate predicate = criteriaBuilder.equal(root.get("ta001"), criteria.getTa001() );
                     predicates.add(predicate);
                 }
-                if (StringUtils.isNotBlank(criteria.getUdf07())) {
-                    Predicate predicate = criteriaBuilder.notEqual(root.get("udf07"), criteria.getUdf07() );
+                if (StringUtils.isNotBlank(criteria.getNeUdf07())) {
+                    Predicate predicate = criteriaBuilder.notEqual(root.get("udf07"), criteria.getNeUdf07() );
                     predicates.add(predicate);
                 }
                 if (StringUtils.isNotBlank(criteria.getGtEqCreateDate())) {
@@ -120,6 +121,7 @@ public class MoctaService {
         return moctaMapper.toMoctbDto(list);
     }
 
+    @Transactional
     public void updateSyncMark(@RequestBody MoctaUpdateParams params){
         Specification<Mocta> query = new Specification<Mocta>() {
             @Override
@@ -137,6 +139,7 @@ public class MoctaService {
         });
     }
 
+    @Transactional
     public void updateState(@RequestBody MoctaUpdateParams params){
         Specification<Mocta> query = new Specification<Mocta>() {
             @Override

src/main/resources/application-thximai.yml

+topsunit:
+  token-expires-hour: 8760
+  authentication-enabled: false
+  print-api-url: http://192.168.1.107:8085/ximaiprintservice/print/PrintLabelByBarTender
+  default-password: 123456
+server:
+  port: 20091
+  servlet:
+    context-path: /
+logging:
+  level:
+    root: info
+    org:
+      springframework:
+        web: info
+    com.topsunit: info
+spring:
+  devtools:
+    restart:
+      additional-paths:
+        - src/main/resources
+  resources:
+    static-locations:
+      - classpath:/static/
+      - classpath:/public/
+  datasource:
+    name: Leader
+    username: sa
+    password: 123qweQWE
+    url: jdbc:sqlserver://192.168.1.21:1433;DatabaseName=Leader
+    type:  com.alibaba.druid.pool.DruidDataSource
+    druid:
+      filters: stat
+      max-active: 20
+      initial-size: 1
+      max-wait: 60000
+      min-idle: 1
+      time-between-eviction-runs-millis: 60000
+      min-evictable-idle-time-millis: 30000
+      validation-query: select 'x'
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+      pool-prepared-statements: true
+      max-open-prepared-statements: 20
+    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+  jackson:
+    serialization:
+      indent-output: true
+  jpa:
+    hibernate:
+      ddl-auto: none
+      naming:
+        physical-strategy: com.topsunit.scanservice.ximai.common.PhysicalNamingStrategyUpperCaseImpl
+    show-sql: true
+  application:
+    name: topsunit-scan-ximai