修改sweb问题

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java

@@ -0,0 +1,65 @@
+package cn.estsh.i3plus.pojo.sweb.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 供应商报警单
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-09-27
+ * @Modify:
+ **/
+@Data
+@Table(name = "SWEB_VENDOR_ALARM")
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("供应商报警单")
+public class SwebVendorAlarm extends BaseBean {
+    @Column(name = "PART_NO")
+    @ApiParam("物料代码")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "VENDOR_CODE")
+    @ApiParam("供应商代码")
+    private String vendorCode;
+
+    @Column(name = "VENDOR_NAME")
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Column(name = "ALARM_CONTENT")
+    @ApiParam("报警内容")
+    private String alarmContent;
+
+    @Column(name = "ALARM_LEVEL")
+    @ApiParam("报警级别")
+    private Integer alarmLevel;
+
+    @Column(name = "STATUS")
+    @ApiParam("状态")
+    private Integer status;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("订单号")
+    private String orderNo;
+
+    @Column(name = "PART_SPEC")
+    @ApiParam("物料描述")
+    private String partSpec;
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorAlarmRepository.java

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.sweb.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.sweb.bean.SwebVendorAlarm;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface SwebVendorAlarmRepository extends BaseRepository<SwebVendorAlarm, Long> {
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java

@@ -204,9 +204,13 @@ public class SwebHqlPack {
         return buildHql(details, result);
     }
 
-    public static DdlPackBean getVendorSupplierCapcity(SwebVendorSupplierCapcity capcity) {
+    public static DdlPackBean getVendorSupplierCapcity(SwebVendorSupplierCapcity capcity, List<String> vendorCodes) {
         DdlPackBean result = new DdlPackBean();
-        DdlPreparedPack.getStringLikerPack(capcity.getVendorCode(), "vendorCode", result);
+        if (vendorCodes.size() == 1) {
+            DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result);
+        } else if (vendorCodes.size() > 1){
+            DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result);
+        }
         DdlPreparedPack.getStringLikerPack(capcity.getPartNo(), "partNo", result);
         DdlPreparedPack.getNumEqualPack(capcity.getStatus(), "status", result);
         if (!StringUtil.isEmpty(capcity.getDateStart())) {
@@ -219,9 +223,13 @@ public class SwebHqlPack {
         return buildHql(capcity, result);
     }
 
-    public static DdlPackBean getSwebRequireAlarm(SwebRequireAlarm alarm) {
+    public static DdlPackBean getSwebRequireAlarm(SwebRequireAlarm alarm, List<String> vendorCodes) {
         DdlPackBean result = new DdlPackBean();
-        DdlPreparedPack.getStringLikerPack(alarm.getVendorCode(), "vendorCode", result);
+        if (vendorCodes.size() == 1) {
+            DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result);
+        } else if (vendorCodes.size() > 1){
+            DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result);
+        }
         DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result);
         if (!StringUtil.isEmpty(alarm.getDateStart())) {
             DdlPreparedPack.getStringBiggerPack(alarm.getDateStart(), "countDate", result);
@@ -233,17 +241,28 @@ public class SwebHqlPack {
         return buildHql(alarm, result);
     }
 
-    public static DdlPackBean getSwebVendorStock(SwebVendorStock stock) {
+    public static DdlPackBean getSwebVendorStock(SwebVendorStock stock, List<String> vendorCodes) {
         DdlPackBean result = new DdlPackBean();
-        DdlPreparedPack.getStringLikerPack(stock.getVendorCode(), "vendorCode", result);
+        if (vendorCodes.size() == 1) {
+            DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result);
+        } else if (vendorCodes.size() > 1){
+            DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result);
+        }
         DdlPreparedPack.getStringLikerPack(stock.getPartNo(), "partNo", result);
-//        if (!StringUtil.isEmpty(alarm.getDateStart())) {
-//            DdlPreparedPack.getStringBiggerPack(alarm.getDateStart(), "countDate", result);
-//        }
-//        if (!StringUtil.isEmpty(alarm.getDateEnd())) {
-//            DdlPreparedPack.getStringSmallerPack(alarm.getDateEnd(), "countDate", result);
-//        }
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
         return buildHql(stock, result);
     }
+
+    public static DdlPackBean getSwebVendorAlarm(SwebVendorAlarm alarm, List<String> vendorCodes) {
+        DdlPackBean result = new DdlPackBean();
+        if (vendorCodes.size() == 1) {
+            DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result);
+        } else if (vendorCodes.size() > 1){
+            DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result);
+        }
+        DdlPreparedPack.getStringLikerPack(alarm.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
+        return buildHql(alarm, result);
+    }
 }