盘盈、盘亏编码调整

添加账套数据配置表

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

+package com.topsunit.scanservice.ximai.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.topsunit.scanservice.ximai.dao.ExAccountInfoDao;
+import com.topsunit.scanservice.ximai.dto.CopmaCriteria;
+import com.topsunit.scanservice.ximai.dto.CopmaDto;
+import com.topsunit.scanservice.ximai.dto.ExAccountInfoDto;
+import com.topsunit.scanservice.ximai.entity.Copma;
+import com.topsunit.scanservice.ximai.entity.ExAccountInfo;
+import com.topsunit.scanservice.ximai.security.PassToken;
+import com.topsunit.scanservice.ximai.service.CopmaService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.persistence.criteria.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>Title: CommonController</p>
+ * <p>Description: 公用Controller</p>
+ *
+ * @author chicheng.li
+ * @version V1.0
+ * @date 2024/10/17
+ */
+@RestController
+public class CommonController {
+
+    @Autowired
+    private ExAccountInfoDao exAccountInfoDao;
+
+    @PassToken
+    @ApiOperation("系统套账查询")
+    @PostMapping("/common/getExAccountInfo")
+    public List<ExAccountInfoDto> getExAccountInfo(){
+        Specification<ExAccountInfo> query = new Specification<ExAccountInfo>() {
+            @Override
+            public Predicate toPredicate(Root<ExAccountInfo> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+                List<Predicate> predicates = new ArrayList<Predicate>();
+                Predicate predicate = criteriaBuilder.equal(root.get("enable"), 1);
+                predicates.add(predicate);
+                criteriaQuery.orderBy(criteriaBuilder.asc(root.get("serial")));
+                return criteriaQuery.where(predicates.toArray(new Predicate[0])).getRestriction();
+            }
+        };
+        return exAccountInfoDao.findAll(query).stream().map(s-> BeanUtil.copyProperties(s, ExAccountInfoDto.class))
+                .collect(Collectors.toList());
+    }
+
+}

src/main/java/com/topsunit/scanservice/ximai/dao/ExAccountInfoDao.java

+package com.topsunit.scanservice.ximai.dao;
+
+import com.topsunit.scanservice.ximai.entity.ExAccountInfo;
+import com.topsunit.scanservice.ximai.entity.WarehouseArrive;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.Optional;
+
+/**
+ *  * <p>Title: ExAccountInfoDao</p>
+ * <p>Description: ExAccountInfoDao</p>
+ *
+ * @author chicheng.li
+ * @version V1.0
+ * @date 2021/11/13
+ */
+public interface ExAccountInfoDao extends JpaRepository<ExAccountInfo, Integer>, JpaSpecificationExecutor<ExAccountInfo> {
+
+
+
+}

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

+package com.topsunit.scanservice.ximai.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * <p>Title: EX_ACCOUNT_INFO</p>
+ * <p>Description: 套账表</p>
+ *
+ * @author chicheng.li
+ * @version V1.0
+ * @date 2025/1/9
+ */
+@Data
+public class ExAccountInfoDto {
+    @Id
+    String id;
+
+    @ApiModelProperty("套账名称")
+    String accountName;
+
+    @ApiModelProperty("接口地睛")
+    String apiUrl;
+
+    @ApiModelProperty("MES接口地址")
+    String mesUrl;
+
+    @ApiModelProperty("开启")
+    String enable;
+}

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

+package com.topsunit.scanservice.ximai.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * <p>Title: EX_ACCOUNT_INFO</p>
+ * <p>Description: 套账表</p>
+ *
+ * @author chicheng.li
+ * @version V1.0
+ * @date 2025/1/9
+ */
+@Data
+@Entity
+@Table(name = "EX_ACCOUNT_INFO")
+public class ExAccountInfo {
+    @Id
+    String id;
+
+    @ApiModelProperty("套账名称")
+    @Column(name = "ACCOUNT_NAME")
+    String accountName;
+
+    @ApiModelProperty("接口地睛")
+    @Column(name = "API_URL")
+    String apiUrl;
+
+    @ApiModelProperty("MES接口地址")
+    @Column(name = "MES_URL")
+    String mesUrl;
+
+    @ApiModelProperty("开启")
+    @Column(name = "ENABLE")
+    String enable;
+
+    @ApiModelProperty("序号")
+    @Column(name = "SERIAL")
+    String serial;
+}

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

@@ -43,8 +43,8 @@ public class InvtaService {
     @Autowired
     private InvmbDao invmbDao;
 
-    private String inventory_shortage = "106";
-    private String inventory_overage = "105";
+    private String inventory_shortage = "116";
+    private String inventory_overage = "115";
     private String inventory_allocate = "128";
 
     /**