Merge remote-tracking branch 'master/master'

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

@@ -35,6 +35,7 @@ public class InRecordController {
                         String carNo,
                         String tallyPeople,
                         String fkComponyName,
+                        String contractNo,
                         HttpServletRequest request) {
 
         try {
@@ -43,7 +44,7 @@ public class InRecordController {
             Date fromDate2 = DateTools.StrToDate(fromDate, "yyyy-MM-dd HH:mm:ss");
             Date toDate2 = DateTools.StrToDate(toDate, "yyyy-MM-dd HH:mm:ss");
             result = inRecordService.query(page, rows, wareName, stackName, model, materialName, standard, customerName,
-                    plateNo,fromDate2,toDate2,userId, belongId,ordNo,carNo,tallyPeople,fkComponyName);
+                    plateNo,fromDate2,toDate2,userId, belongId,ordNo,carNo,tallyPeople,fkComponyName,contractNo);
         } catch (Exception ex) {
             ex.printStackTrace();
             result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());

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

@@ -33,6 +33,7 @@ public class OutRecordController {
                            String tallyPeople,
                            String ordNo,
                            String fkComponyName,
+                           String contractNo,
                            HttpServletRequest request) {
 
         try {
@@ -42,7 +43,7 @@ public class OutRecordController {
             Date toDate = DateTools.StrToDate(pToDate, "yyyy-MM-dd HH:mm:ss");
 
             result = outRecordService.query(page, rows, wareName, stackName, model, materialName, standard, customerName,
-                    plateNo,fromDate,toDate, userId, belongId,carNo,tallyPeople,ordNo,fkComponyName);
+                    plateNo,fromDate,toDate, userId, belongId,carNo,tallyPeople,ordNo,fkComponyName,contractNo);
         } catch (Exception ex) {
             ex.printStackTrace();
             result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());

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

@@ -104,6 +104,7 @@ public class StoreController {
                               String toDate,
                               String fkcustmerName,
                               String ordNo,
+                              String contractNo,
                               HttpServletRequest request) {
 
         try {
@@ -121,6 +122,7 @@ public class StoreController {
                     toDate,
                     fkcustmerName,
                     ordNo,
+                    contractNo,
                     userId,
                     belongId);
         } catch (Exception ex) {

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

@@ -24,7 +24,7 @@ public interface InRecordMapper {
     //根据条件查询全部数据
     List<InRecord> select(String wareName, String stackName, String layer, String materialName, String standard, String customerName,
                           String plateNo, Date fromDate,
-                          Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople, String fkComponyName);
+                          Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople, String fkComponyName,String contractNo);
 
     int updateIn(InRecord inRecord);
 

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

@@ -22,7 +22,8 @@ public interface OutRecordMapper {
     List<OutRecord>  select(String wareName, String stackName, String layer, String materialName, String standard, String customerName,
                             String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName);
     List<OutRecord>  selectExpt(String wareName, String stackName, String layer, String materialName, String standard, String customerName,
-                            String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName);
+                            String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople,
+                            String ordNo, String fkComponyName,String contractNo);
     List<TotalRecord>  selectTotal(String wareName, String stackName, String layer, String materialName, String standard, String customerName,
                                    String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName);
 

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

@@ -33,7 +33,8 @@ public interface StoreMapper {
 
     List<Store> selectStore(String wareName, String stackName, String model, String materialName, String standard,
                             String customerName, String fromDate,   String toDate, String userId,
-                            String belongId,String plateNo,String fkcustmerName,String ordNo,List<String> plateNos);
+                            String belongId,String plateNo,String fkcustmerName,String ordNo,List<String> plateNos,
+                            String contractNo);
 
     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/DistributionServiceImpl.java

@@ -39,6 +39,7 @@ public class DistributionServiceImpl implements DistributionService {
     String result = Type.FAIL;
     int num = 0;
 
+
     @Override
     public String queryWaitTrucks(String userId, String belongId) {
 
@@ -79,14 +80,24 @@ public class DistributionServiceImpl implements DistributionService {
         });
         List<Store> list = JSON.parseObject(jsonList, new TypeReference<List<Store>>() {
         });
-        if (distribution.getListDetail().size() == list.size()) {
-            distribution.setOutFlag("2");
-            num += distributionMapper.updateByPrimaryKey(distribution);
-        }
+
+        int detailnum = 0;
+        double detailwgt = 0;
+
         for (int i = 0; i < list.size(); i++) {
             list.get(i).setLockFlag("0");
+            detailnum += list.get(i).getCount();
+            detailwgt += list.get(i).getWeight();
             num += storeMapper.updateByPrimaryKey(list.get(i));
         }
+        if (distribution.getListDetail().size() == list.size()) {
+            distribution.setOutFlag("2");
+            num += distributionMapper.updateByPrimaryKey(distribution);
+        }else {
+            distribution.setSumCount(distribution.getSumCount() - detailnum);
+            distribution.setSumWeight(distribution.getSumWeight() - detailwgt);
+            num += distributionMapper.updateByPrimaryKey(distribution);
+        }
         for (int i = 0; i < distribution.getListDetail().size(); i++) {
             for (int j = 0; j < list.size(); j++) {
                 if (distribution.getListDetail().get(i).getStore().getId().equals(list.get(j).getId())) {

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

@@ -27,16 +27,16 @@ public class InRecordServiceImpl implements InRecordService {
     @Override
     public String query(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
                         String plateNo, Date fromDate,
-                        Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople, String fkComponyName) {
+                        Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople, String fkComponyName,String contractNo) {
         if(page == -1 && rows == -1){
             List<InRecord> list=inRecordMapper.select(wareName,stackName,model,materialName,standard,    customerName,
-                    plateNo, fromDate,toDate , userId, belongId,ordNo,carNo,tallyPeople,fkComponyName);;
+                    plateNo, fromDate,toDate , userId, belongId,ordNo,carNo,tallyPeople,fkComponyName,contractNo);;
             result = JSONTools.toStringyyyyMMddHHmmss(list);
         }else{
             PageHelper.startPage(page, rows);
 
             List<InRecord> list=inRecordMapper.select(wareName,stackName,model,materialName,standard,    customerName,
-                    plateNo, fromDate,toDate , userId, belongId, ordNo, carNo,tallyPeople,fkComponyName);
+                    plateNo, fromDate,toDate , userId, belongId, ordNo, carNo,tallyPeople,fkComponyName,contractNo);
 
             PageInfo<InRecord> pageInfo = new PageInfo<>(list);
             result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);

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

@@ -38,15 +38,16 @@ public class OutRecordServiceImpl implements OutRecordService {
     int num = 0;
 
     public String query(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
-                        String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName) {
+                        String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName,
+                        String contractNo) {
         if(page == -1 && rows == -1){
             List<OutRecord> list=outRecordMapper.selectExpt(wareName,stackName,model,materialName,standard,  customerName,
-                    plateNo, fromDate,  toDate,   userId, belongId,carNo, tallyPeople,ordNo,fkComponyName);
+                    plateNo, fromDate,  toDate,   userId, belongId,carNo, tallyPeople,ordNo,fkComponyName,contractNo);
             result = JSONTools.toStringyyyyMMddHHmmss(list);
         }else{
             PageHelper.startPage(page, rows);
             List<OutRecord> list=outRecordMapper.selectExpt(wareName,stackName,model,materialName,standard,  customerName,
-                    plateNo, fromDate,  toDate,   userId, belongId,carNo,tallyPeople,ordNo,fkComponyName);
+                    plateNo, fromDate,  toDate,   userId, belongId,carNo,tallyPeople,ordNo,fkComponyName,contractNo);
             PageInfo<OutRecord> pageInfo = new PageInfo<>(list);
 //        result = JSONTools.toString(pageInfo);
             result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);

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

@@ -145,6 +145,9 @@ public class OutServiceImpl implements OutService {
         Distribution distribution = JSON.parseObject(json, new TypeReference<Distribution>() {
         });
         distribution.setOutFlag("1");
+        if(distribution.getTransportName().equals("")||distribution.getTransportName() == null){
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, "承运单位不可为空！");
+        }
         num += distributionMapper.updateByPrimaryKey(distribution);
         List<String> listStoreId = new ArrayList<String>();
         for (int i = 0; i < distribution.getListDetail().size(); i++) {

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

@@ -85,7 +85,7 @@ public class StoreServiceImpl implements StoreService {
                              String toDate,
                              String fkcustmerName,
                              String ordNo,
-
+                             String contractNo,
                              String userId,
                              String belongId) {
 
@@ -97,13 +97,13 @@ public class StoreServiceImpl implements StoreService {
 
         if(page == -1 && rows == -1){
             List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,
-                    customerName,fromDate, toDate,  userId,belongId, plateNo,fkcustmerName,ordNo,pltNos);
+                    customerName,fromDate, toDate,  userId,belongId, plateNo,fkcustmerName,ordNo,pltNos,contractNo);
             result = JSONTools.toStringyyyyMMddHHmmss(list);
         }else {
             PageHelper.startPage(page, rows);
 
             List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,
-                    customerName,fromDate, toDate,  userId,belongId, plateNo,fkcustmerName,ordNo,pltNos);
+                    customerName,fromDate, toDate,  userId,belongId, plateNo,fkcustmerName,ordNo,pltNos,contractNo);
             PageInfo<Store> pageInfo = new PageInfo<>(list);
             result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
         }

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

@@ -5,7 +5,7 @@ import java.util.Date;
 public interface InRecordService {
     String query(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
                  String plateNo, Date fromDate,
-                 Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople, String fkComponyName);
+                 Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople, String fkComponyName,String contractNo);
 
     String updateIn(String json, String userId, String belongId);
 

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

@@ -5,7 +5,8 @@ import java.util.Date;
 public interface OutRecordService {
 
     String query(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
-                 String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName);
+                 String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName,
+                 String contractNo);
     String queryTotal(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
                       String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName);
 

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

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

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

@@ -338,6 +338,7 @@
       and t.add_time between #{param8,jdbcType=TIMESTAMP} and #{param9,jdbcType=TIMESTAMP}
     and t.cancel_flag = '0'
     and ifnull(t.ord_no,'*') like concat('%',#{param12,jdbcType=VARCHAR},'%')
+    and ifnull(t.contract_no,'*') like concat('%',#{param16,jdbcType=VARCHAR},'%')
     and ifnull(t.car_no,'*') like concat('%',#{param13,jdbcType=VARCHAR},'%')
     and ((t.belong_id=#{param11,jdbcType=VARCHAR} and  t.ware_name in (
             select b.name from t_maint_userware a ,t_maint_ware b  where a.ware_id = b.id

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

@@ -488,6 +488,7 @@
     )  or t.customer_name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%') )
     and ifnull(p.tally_people,'*') like concat('%',#{param13,jdbcType=VARCHAR},'%')
     and ifnull(c.ord_no,'*') like concat('%',#{param14,jdbcType=VARCHAR},'%')
+    and ifnull(t.contract_no,'*') like concat('%',#{param16,jdbcType=VARCHAR},'%')
     and ifnull(e.name,'*') like concat('%',#{param15,jdbcType=VARCHAR},'%')
     and ifnull(t.back_flag,0) <> '1'
     order by t.add_time desc

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

@@ -450,6 +450,7 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
         )
     and e.name like concat('%',#{param12,jdbcType=VARCHAR},'%')
     and t.ord_no like concat('%',#{param13,jdbcType=VARCHAR},'%')
+    and ifnull(t.contract_no,'*') like concat('%',#{param15,jdbcType=VARCHAR},'%')
     and t.cancel_flag = '0'
     and t.out_flag = '0'
       <if test="param7 != null and param7 != '' and param8 != null and param8 != ''">