修改细节内容 5.12 1.0

src/main/java/com/th/demo/controller/ware/StoreController.java

@@ -99,6 +99,10 @@ public class StoreController {
                               String materialName,
                              String standard,
                              String customerName,
+                             String fkcustmerName,
+                             String plateNo,
+                             String ordNo,
+                             String contractNo,
                               HttpServletRequest request) {
 
         try {
@@ -112,7 +116,7 @@ public class StoreController {
                     standard,
                       customerName,
                     userId,
-                    belongId);
+                    belongId,plateNo,ordNo,contractNo,fkcustmerName);
         } catch (Exception ex) {
             ex.printStackTrace();
             result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());

src/main/java/com/th/demo/mapping/ware/StoreMapper.java

@@ -31,7 +31,10 @@ public interface StoreMapper {
 
     Store selectByOutId(String id,String noUserParam,String userId, String belongId);
 
-    List<Store> selectStore(String wareName, String stackName, String model, String materialName, String standard,   String customerName, String userId,String belongId);
+    List<Store> selectStore(String wareName, String stackName, String model, String materialName, String standard,
+                            String customerName, String userId,String belongId,
+                            String fkcustmerName, String plateNo,String ordNo,String contractNo,
+                            List<String> plateNos,List<String> ordNos, List<String> contractNos);
 
     int updateForUpDownByLayer(String wareName, String stackName, String userId, String belongId, int min, int max, int i);
 

src/main/java/com/th/demo/service/impl/ware/InServiceImpl.java

@@ -152,27 +152,28 @@ public class InServiceImpl implements InService {
             int currentLayer = Integer.parseInt(storeMapper.selectLayerByStackId(listStore.get(0).getStack().getId(), belongId));
             int min = listStore.get(0).getLayer();
             int max = listStore.get(listStore.size() - 1).getLayer();
-            if (currentLayer != max) {
-                result = JSONTools.toString(ResponseCodeMsg.CODE_EX, "必须包含最上层取消出库！");
-            } else if (!WareTools.checkOrder(listStore)) {
-                result = JSONTools.toString(ResponseCodeMsg.CODE_EX, "请选中连续数据取消出库！");
-            } else {
-                for (int i = 0; i < listStore.size(); i++) {
-                    int effStoreCnt = storeMapper.selEffStore(listStore.get(i).getPlateNo());
-                    if(effStoreCnt == 0){
-                        return JSONTools.toString(1,"库存中不存在板号"+listStore.get(i).getPlateNo()+",无法取消出库");
-                    }
-                    InRecord inRecord = getInRecord(listStore.get(i), "0", userId);
-                    num += inRecordMapper.insert(inRecord);
+//            if (currentLayer != max) {
+//                result = JSONTools.toString(ResponseCodeMsg.CODE_EX, "必须包含最上层取消出库！");
+//            } else if (!WareTools.checkOrder(listStore)) {
+//                result = JSONTools.toString(ResponseCodeMsg.CODE_EX, "请选中连续数据取消出库！");
+//            } else {
+//
+//            }
+            for (int i = 0; i < listStore.size(); i++) {
+                int effStoreCnt = storeMapper.selEffStore(listStore.get(i).getPlateNo());
+                if(effStoreCnt == 0){
+                    return JSONTools.toString(1,"库存中不存在板号"+listStore.get(i).getPlateNo()+",无法取消出库");
+                }
+                InRecord inRecord = getInRecord(listStore.get(i), "0", userId);
+                num += inRecordMapper.insert(inRecord);
 
-                    //listStore.get(i).setOutId(outRecord.getId());
-                    listStore.get(i).setCancelFlag("1");
-                    num += storeMapper.updateByPrimaryKey(listStore.get(i));
-                    num += inRecordMapper.deleteByPrimaryKey(listStore.get(i).getInId());
+                //listStore.get(i).setOutId(outRecord.getId());
+                listStore.get(i).setCancelFlag("1");
+                num += storeMapper.updateByPrimaryKey(listStore.get(i));
+                num += inRecordMapper.deleteByPrimaryKey(listStore.get(i).getInId());
 
-                }
-                result = Tools.moreThanZeroResultJSON(num);
             }
+            result = Tools.moreThanZeroResultJSON(num);
         }
         return result;
     }

src/main/java/com/th/demo/service/impl/ware/OutServiceImpl.java

@@ -181,27 +181,28 @@ public class OutServiceImpl implements OutService {
                 int currentLayer = Integer.parseInt(storeMapper.selectLayerByStackId(listStore.get(0).getStack().getId(), belongId));
                 int min = listStore.get(0).getLayer();
                 int max = listStore.get(listStore.size() - 1).getLayer();
-                if (currentLayer != max) {
-                    throw new Exception("库房：" + listStore.get(m).getWare().getName() + ",垛位：" + listStore.get(m).getStack().getName() + ",出库物料不在最上层，无法出库！");
-                    // result = JSONTools.toString(ResponseCodeMsg.CODE_EX, "必须选择最上层出库！");
-                } else if (!WareTools.checkOrder(listStore)) {
-                    throw new Exception("库房：" + listStore.get(m).getWare().getName() + ",垛位：" + listStore.get(m).getStack().getName() + ",出库物料不在最上层，无法出库！");
-                    //  result = JSONTools.toString(ResponseCodeMsg.CODE_EX, "请选中连续数据移动！");
-                } else {
-                    for (int i = 0; i < listStore.size(); i++) {
-                        OutRecord outRecord = getOutRecord(listStore.get(i), distribution.getId(), "1", userId);
-                        num += outRecordMapper.insert(outRecord);
+//                if (currentLayer != max) {
+//                    throw new Exception("库房：" + listStore.get(m).getWare().getName() + ",垛位：" + listStore.get(m).getStack().getName() + ",出库物料不在最上层，无法出库！");
+//                    // result = JSONTools.toString(ResponseCodeMsg.CODE_EX, "必须选择最上层出库！");
+//                } else if (!WareTools.checkOrder(listStore)) {
+//                    throw new Exception("库房：" + listStore.get(m).getWare().getName() + ",垛位：" + listStore.get(m).getStack().getName() + ",出库物料不在最上层，无法出库！");
+//                    //  result = JSONTools.toString(ResponseCodeMsg.CODE_EX, "请选中连续数据移动！");
+//                } else {
+//
+//                }
+                for (int i = 0; i < listStore.size(); i++) {
+                    OutRecord outRecord = getOutRecord(listStore.get(i), distribution.getId(), "1", userId);
+                    num += outRecordMapper.insert(outRecord);
 
-                        AccountDetail accountDetail = getAccountDetail(listStore.get(i), distribution.getSumWeight(), distribution.getSuttle(), userId, belongId);
-                        num += accountDetailMapper.insert(accountDetail);
+                    AccountDetail accountDetail = getAccountDetail(listStore.get(i), distribution.getSumWeight(), distribution.getSuttle(), userId, belongId);
+                    num += accountDetailMapper.insert(accountDetail);
 
-                        listStore.get(i).setOutId(outRecord.getId());
-                        listStore.get(i).setOutFlag("1");
-                        num += storeMapper.updateByPrimaryKey(listStore.get(i));
+                    listStore.get(i).setOutId(outRecord.getId());
+                    listStore.get(i).setOutFlag("1");
+                    num += storeMapper.updateByPrimaryKey(listStore.get(i));
 
-                    }
-                    result = Tools.moreThanZeroResultJSON(num);
                 }
+                result = Tools.moreThanZeroResultJSON(num);
             }
         }
         return result;

src/main/java/com/th/demo/service/impl/ware/StoreServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -80,11 +81,36 @@ public class StoreServiceImpl implements StoreService {
                              String standard,
                              String customerName,
                              String userId,
-                             String belongId) {
-        PageHelper.startPage(page, rows);
-        List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,    customerName,   userId,belongId);
-        PageInfo<Store> pageInfo = new PageInfo<>(list);
-        result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
+                             String belongId,
+                             String plateNo,
+                             String ordNo,
+                             String contractNo,
+                             String fkcustmerName) {
+        List<String> pltNos =new ArrayList<>() ;
+        List<String> ordNos =new ArrayList<>() ;
+        List<String> contractNos =new ArrayList<>() ;
+        if (plateNo.indexOf(",") != -1){
+            pltNos = Arrays.asList(plateNo.split(","));
+        }
+        if (ordNo.indexOf(",") != -1){
+            ordNos = Arrays.asList(ordNo.split(","));
+        }
+        if (contractNo.indexOf(",") != -1){
+            contractNos = Arrays.asList(contractNo.split(","));
+        }
+
+        if (page == -1 && rows == -1){
+            List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,    customerName,   userId,belongId,
+                    fkcustmerName,plateNo,ordNo,contractNo,pltNos,ordNos,contractNos);
+            result = JSONTools.toStringyyyyMMddHHmmss(list);
+        }else {
+            PageHelper.startPage(page, rows);
+            List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,    customerName,   userId,belongId,
+                    fkcustmerName,plateNo,ordNo,contractNo,pltNos,ordNos,contractNos);
+            PageInfo<Store> pageInfo = new PageInfo<>(list);
+            result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
+        }
+
         return result;
     }
 

src/main/java/com/th/demo/service/ware/StoreService.java

@@ -11,7 +11,9 @@ public interface StoreService {
     
     String modify(String json, String userId, String belongId);
 
-    String queryStore(int page,int rows,String wareName,String stackName,String model,String materialName,String standard,  String customerName, String userId,String belongId);
+    String queryStore(int page,int rows,String wareName,String stackName,String model,String materialName,String standard,
+                      String customerName, String userId,String belongId,
+                      String plateNo, String ordNo, String contractNo,String fkcustmerName);
 
     String modifyCustomer(String id,String customerNameOld,String customerNameNew);
 

src/main/resource/mapper/ware/StoreMapper.xml

@@ -493,6 +493,26 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
     and  c.name like concat('%',#{param4,jdbcType=VARCHAR},'%')
     and  c.standard like concat('%',#{param5,jdbcType=VARCHAR},'%')
     and  d.name like concat('%',#{param6,jdbcType=VARCHAR},'%')
+    and  e.name like concat('%',#{param9,jdbcType=VARCHAR},'%')
+
+      and  (t.plate_no like concat('%',#{param10,jdbcType=VARCHAR},'%')
+    <if test="param13 != null and param13.size() !=0" >
+      or t.plate_no IN <foreach  item="item" collection="param13" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>
+    )
+    and  (t.ord_no like concat('%',#{param11,jdbcType=VARCHAR},'%')
+    <if test="param14 != null and param14.size() !=0" >
+      OR t.ord_no IN <foreach  item="item" collection="param14" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>
+    )
+    and  (t.contract_no like concat('%',#{param12,jdbcType=VARCHAR},'%')
+    <if test="param15 != null and param15.size() !=0" >
+      OR t.contract_no IN <foreach  item="item" collection="param15" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>
+    )
     and t.belong_id = #{param8,jdbcType=VARCHAR}
     and t.cancel_flag = '0'
     and t.out_flag = '0'