Browse Source

承运商可输入+合约号查询

LiuCheng 11 months ago
parent
commit
cd98f00cb2

+ 2
- 1
src/main/java/com/th/demo/controller/ware/InRecordController.java View File

35
                         String carNo,
35
                         String carNo,
36
                         String tallyPeople,
36
                         String tallyPeople,
37
                         String fkComponyName,
37
                         String fkComponyName,
38
+                        String contractNo,
38
                         HttpServletRequest request) {
39
                         HttpServletRequest request) {
39
 
40
 
40
         try {
41
         try {
43
             Date fromDate2 = DateTools.StrToDate(fromDate, "yyyy-MM-dd HH:mm:ss");
44
             Date fromDate2 = DateTools.StrToDate(fromDate, "yyyy-MM-dd HH:mm:ss");
44
             Date toDate2 = DateTools.StrToDate(toDate, "yyyy-MM-dd HH:mm:ss");
45
             Date toDate2 = DateTools.StrToDate(toDate, "yyyy-MM-dd HH:mm:ss");
45
             result = inRecordService.query(page, rows, wareName, stackName, model, materialName, standard, customerName,
46
             result = inRecordService.query(page, rows, wareName, stackName, model, materialName, standard, customerName,
46
-                    plateNo,fromDate2,toDate2,userId, belongId,ordNo,carNo,tallyPeople,fkComponyName);
47
+                    plateNo,fromDate2,toDate2,userId, belongId,ordNo,carNo,tallyPeople,fkComponyName,contractNo);
47
         } catch (Exception ex) {
48
         } catch (Exception ex) {
48
             ex.printStackTrace();
49
             ex.printStackTrace();
49
             result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
50
             result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());

+ 2
- 1
src/main/java/com/th/demo/controller/ware/OutRecordController.java View File

33
                            String tallyPeople,
33
                            String tallyPeople,
34
                            String ordNo,
34
                            String ordNo,
35
                            String fkComponyName,
35
                            String fkComponyName,
36
+                           String contractNo,
36
                            HttpServletRequest request) {
37
                            HttpServletRequest request) {
37
 
38
 
38
         try {
39
         try {
42
             Date toDate = DateTools.StrToDate(pToDate, "yyyy-MM-dd HH:mm:ss");
43
             Date toDate = DateTools.StrToDate(pToDate, "yyyy-MM-dd HH:mm:ss");
43
 
44
 
44
             result = outRecordService.query(page, rows, wareName, stackName, model, materialName, standard, customerName,
45
             result = outRecordService.query(page, rows, wareName, stackName, model, materialName, standard, customerName,
45
-                    plateNo,fromDate,toDate, userId, belongId,carNo,tallyPeople,ordNo,fkComponyName);
46
+                    plateNo,fromDate,toDate, userId, belongId,carNo,tallyPeople,ordNo,fkComponyName,contractNo);
46
         } catch (Exception ex) {
47
         } catch (Exception ex) {
47
             ex.printStackTrace();
48
             ex.printStackTrace();
48
             result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
49
             result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());

+ 2
- 0
src/main/java/com/th/demo/controller/ware/StoreController.java View File

104
                               String toDate,
104
                               String toDate,
105
                               String fkcustmerName,
105
                               String fkcustmerName,
106
                               String ordNo,
106
                               String ordNo,
107
+                              String contractNo,
107
                               HttpServletRequest request) {
108
                               HttpServletRequest request) {
108
 
109
 
109
         try {
110
         try {
121
                     toDate,
122
                     toDate,
122
                     fkcustmerName,
123
                     fkcustmerName,
123
                     ordNo,
124
                     ordNo,
125
+                    contractNo,
124
                     userId,
126
                     userId,
125
                     belongId);
127
                     belongId);
126
         } catch (Exception ex) {
128
         } catch (Exception ex) {

+ 1
- 1
src/main/java/com/th/demo/mapping/ware/InRecordMapper.java View File

24
     //根据条件查询全部数据
24
     //根据条件查询全部数据
25
     List<InRecord> select(String wareName, String stackName, String layer, String materialName, String standard, String customerName,
25
     List<InRecord> select(String wareName, String stackName, String layer, String materialName, String standard, String customerName,
26
                           String plateNo, Date fromDate,
26
                           String plateNo, Date fromDate,
27
-                          Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople, String fkComponyName);
27
+                          Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople, String fkComponyName,String contractNo);
28
 
28
 
29
     int updateIn(InRecord inRecord);
29
     int updateIn(InRecord inRecord);
30
 
30
 

+ 2
- 1
src/main/java/com/th/demo/mapping/ware/OutRecordMapper.java View File

22
     List<OutRecord>  select(String wareName, String stackName, String layer, String materialName, String standard, String customerName,
22
     List<OutRecord>  select(String wareName, String stackName, String layer, String materialName, String standard, String customerName,
23
                             String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName);
23
                             String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName);
24
     List<OutRecord>  selectExpt(String wareName, String stackName, String layer, String materialName, String standard, String customerName,
24
     List<OutRecord>  selectExpt(String wareName, String stackName, String layer, String materialName, String standard, String customerName,
25
-                            String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName);
25
+                            String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople,
26
+                            String ordNo, String fkComponyName,String contractNo);
26
     List<TotalRecord>  selectTotal(String wareName, String stackName, String layer, String materialName, String standard, String customerName,
27
     List<TotalRecord>  selectTotal(String wareName, String stackName, String layer, String materialName, String standard, String customerName,
27
                                    String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName);
28
                                    String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName);
28
 
29
 

+ 2
- 1
src/main/java/com/th/demo/mapping/ware/StoreMapper.java View File

33
 
33
 
34
     List<Store> selectStore(String wareName, String stackName, String model, String materialName, String standard,
34
     List<Store> selectStore(String wareName, String stackName, String model, String materialName, String standard,
35
                             String customerName, String fromDate,   String toDate, String userId,
35
                             String customerName, String fromDate,   String toDate, String userId,
36
-                            String belongId,String plateNo,String fkcustmerName,String ordNo,List<String> plateNos);
36
+                            String belongId,String plateNo,String fkcustmerName,String ordNo,List<String> plateNos,
37
+                            String contractNo);
37
 
38
 
38
     int updateForUpDownByLayer(String wareName, String stackName, String userId, String belongId, int min, int max, int i);
39
     int updateForUpDownByLayer(String wareName, String stackName, String userId, String belongId, int min, int max, int i);
39
 
40
 

+ 3
- 3
src/main/java/com/th/demo/service/impl/ware/InRecordServiceImpl.java View File

27
     @Override
27
     @Override
28
     public String query(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
28
     public String query(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
29
                         String plateNo, Date fromDate,
29
                         String plateNo, Date fromDate,
30
-                        Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople, String fkComponyName) {
30
+                        Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople, String fkComponyName,String contractNo) {
31
         if(page == -1 && rows == -1){
31
         if(page == -1 && rows == -1){
32
             List<InRecord> list=inRecordMapper.select(wareName,stackName,model,materialName,standard,    customerName,
32
             List<InRecord> list=inRecordMapper.select(wareName,stackName,model,materialName,standard,    customerName,
33
-                    plateNo, fromDate,toDate , userId, belongId,ordNo,carNo,tallyPeople,fkComponyName);;
33
+                    plateNo, fromDate,toDate , userId, belongId,ordNo,carNo,tallyPeople,fkComponyName,contractNo);;
34
             result = JSONTools.toStringyyyyMMddHHmmss(list);
34
             result = JSONTools.toStringyyyyMMddHHmmss(list);
35
         }else{
35
         }else{
36
             PageHelper.startPage(page, rows);
36
             PageHelper.startPage(page, rows);
37
 
37
 
38
             List<InRecord> list=inRecordMapper.select(wareName,stackName,model,materialName,standard,    customerName,
38
             List<InRecord> list=inRecordMapper.select(wareName,stackName,model,materialName,standard,    customerName,
39
-                    plateNo, fromDate,toDate , userId, belongId, ordNo, carNo,tallyPeople,fkComponyName);
39
+                    plateNo, fromDate,toDate , userId, belongId, ordNo, carNo,tallyPeople,fkComponyName,contractNo);
40
 
40
 
41
             PageInfo<InRecord> pageInfo = new PageInfo<>(list);
41
             PageInfo<InRecord> pageInfo = new PageInfo<>(list);
42
             result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
42
             result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);

+ 4
- 3
src/main/java/com/th/demo/service/impl/ware/OutRecordServiceImpl.java View File

38
     int num = 0;
38
     int num = 0;
39
 
39
 
40
     public String query(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
40
     public String query(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
41
-                        String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName) {
41
+                        String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName,
42
+                        String contractNo) {
42
         if(page == -1 && rows == -1){
43
         if(page == -1 && rows == -1){
43
             List<OutRecord> list=outRecordMapper.selectExpt(wareName,stackName,model,materialName,standard,  customerName,
44
             List<OutRecord> list=outRecordMapper.selectExpt(wareName,stackName,model,materialName,standard,  customerName,
44
-                    plateNo, fromDate,  toDate,   userId, belongId,carNo, tallyPeople,ordNo,fkComponyName);
45
+                    plateNo, fromDate,  toDate,   userId, belongId,carNo, tallyPeople,ordNo,fkComponyName,contractNo);
45
             result = JSONTools.toStringyyyyMMddHHmmss(list);
46
             result = JSONTools.toStringyyyyMMddHHmmss(list);
46
         }else{
47
         }else{
47
             PageHelper.startPage(page, rows);
48
             PageHelper.startPage(page, rows);
48
             List<OutRecord> list=outRecordMapper.selectExpt(wareName,stackName,model,materialName,standard,  customerName,
49
             List<OutRecord> list=outRecordMapper.selectExpt(wareName,stackName,model,materialName,standard,  customerName,
49
-                    plateNo, fromDate,  toDate,   userId, belongId,carNo,tallyPeople,ordNo,fkComponyName);
50
+                    plateNo, fromDate,  toDate,   userId, belongId,carNo,tallyPeople,ordNo,fkComponyName,contractNo);
50
             PageInfo<OutRecord> pageInfo = new PageInfo<>(list);
51
             PageInfo<OutRecord> pageInfo = new PageInfo<>(list);
51
 //        result = JSONTools.toString(pageInfo);
52
 //        result = JSONTools.toString(pageInfo);
52
             result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
53
             result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);

+ 3
- 3
src/main/java/com/th/demo/service/impl/ware/StoreServiceImpl.java View File

85
                              String toDate,
85
                              String toDate,
86
                              String fkcustmerName,
86
                              String fkcustmerName,
87
                              String ordNo,
87
                              String ordNo,
88
-
88
+                             String contractNo,
89
                              String userId,
89
                              String userId,
90
                              String belongId) {
90
                              String belongId) {
91
 
91
 
97
 
97
 
98
         if(page == -1 && rows == -1){
98
         if(page == -1 && rows == -1){
99
             List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,
99
             List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,
100
-                    customerName,fromDate, toDate,  userId,belongId, plateNo,fkcustmerName,ordNo,pltNos);
100
+                    customerName,fromDate, toDate,  userId,belongId, plateNo,fkcustmerName,ordNo,pltNos,contractNo);
101
             result = JSONTools.toStringyyyyMMddHHmmss(list);
101
             result = JSONTools.toStringyyyyMMddHHmmss(list);
102
         }else {
102
         }else {
103
             PageHelper.startPage(page, rows);
103
             PageHelper.startPage(page, rows);
104
 
104
 
105
             List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,
105
             List<Store> list=storeMapper.selectStore(wareName,stackName,model,materialName,standard,
106
-                    customerName,fromDate, toDate,  userId,belongId, plateNo,fkcustmerName,ordNo,pltNos);
106
+                    customerName,fromDate, toDate,  userId,belongId, plateNo,fkcustmerName,ordNo,pltNos,contractNo);
107
             PageInfo<Store> pageInfo = new PageInfo<>(list);
107
             PageInfo<Store> pageInfo = new PageInfo<>(list);
108
             result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
108
             result = JSONTools.toStringyyyyMMddHHmmss(pageInfo);
109
         }
109
         }

+ 1
- 1
src/main/java/com/th/demo/service/ware/InRecordService.java View File

5
 public interface InRecordService {
5
 public interface InRecordService {
6
     String query(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
6
     String query(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
7
                  String plateNo, Date fromDate,
7
                  String plateNo, Date fromDate,
8
-                 Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople, String fkComponyName);
8
+                 Date toDate, String userId, String belongId, String ordNo, String carNo, String tallyPeople, String fkComponyName,String contractNo);
9
 
9
 
10
     String updateIn(String json, String userId, String belongId);
10
     String updateIn(String json, String userId, String belongId);
11
 
11
 

+ 2
- 1
src/main/java/com/th/demo/service/ware/OutRecordService.java View File

5
 public interface OutRecordService {
5
 public interface OutRecordService {
6
 
6
 
7
     String query(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
7
     String query(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
8
-                 String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName);
8
+                 String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName,
9
+                 String contractNo);
9
     String queryTotal(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
10
     String queryTotal(int page, int rows, String wareName, String stackName, String model, String materialName, String standard, String customerName,
10
                       String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName);
11
                       String plateNo, Date fromDate, Date toDate, String userId, String belongId, String carNo, String tallyPeople, String ordNo, String fkComponyName);
11
 
12
 

+ 1
- 1
src/main/java/com/th/demo/service/ware/StoreService.java View File

13
 
13
 
14
     String queryStore(int page,int rows,String wareName,String stackName,String model,String materialName,
14
     String queryStore(int page,int rows,String wareName,String stackName,String model,String materialName,
15
                       String standard, String customerName, String plateNo,String fromDate,
15
                       String standard, String customerName, String plateNo,String fromDate,
16
-                      String toDate, String fkcustmerName,String ordNo,
16
+                      String toDate, String fkcustmerName,String ordNo,String contractNo,
17
                       String userId,String belongId);
17
                       String userId,String belongId);
18
 
18
 
19
     String modifyCustomer(String id,String customerNameOld,String customerNameNew);
19
     String modifyCustomer(String id,String customerNameOld,String customerNameNew);

+ 1
- 0
src/main/resource/mapper/ware/InRecordMapper.xml View File

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

+ 1
- 0
src/main/resource/mapper/ware/OutRecordMapper.xml View File

488
     )  or t.customer_name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%') )
488
     )  or t.customer_name like CONCAT((select attr3 from sys_user temp where temp.id=#{param10,jdbcType=VARCHAR}),'%') )
489
     and ifnull(p.tally_people,'*') like concat('%',#{param13,jdbcType=VARCHAR},'%')
489
     and ifnull(p.tally_people,'*') like concat('%',#{param13,jdbcType=VARCHAR},'%')
490
     and ifnull(c.ord_no,'*') like concat('%',#{param14,jdbcType=VARCHAR},'%')
490
     and ifnull(c.ord_no,'*') like concat('%',#{param14,jdbcType=VARCHAR},'%')
491
+    and ifnull(t.contract_no,'*') like concat('%',#{param16,jdbcType=VARCHAR},'%')
491
     and ifnull(e.name,'*') like concat('%',#{param15,jdbcType=VARCHAR},'%')
492
     and ifnull(e.name,'*') like concat('%',#{param15,jdbcType=VARCHAR},'%')
492
     and ifnull(t.back_flag,0) &lt;> '1'
493
     and ifnull(t.back_flag,0) &lt;> '1'
493
     order by t.add_time desc
494
     order by t.add_time desc

+ 1
- 0
src/main/resource/mapper/ware/StoreMapper.xml View File

449
         )
449
         )
450
     and e.name like concat('%',#{param12,jdbcType=VARCHAR},'%')
450
     and e.name like concat('%',#{param12,jdbcType=VARCHAR},'%')
451
     and t.ord_no like concat('%',#{param13,jdbcType=VARCHAR},'%')
451
     and t.ord_no like concat('%',#{param13,jdbcType=VARCHAR},'%')
452
+    and ifnull(t.contract_no,'*') like concat('%',#{param15,jdbcType=VARCHAR},'%')
452
     and t.cancel_flag = '0'
453
     and t.cancel_flag = '0'
453
     and t.out_flag = '0'
454
     and t.out_flag = '0'
454
       <if test="param7 != null and param7 != '' and param8 != null and param8 != ''">
455
       <if test="param7 != null and param7 != '' and param8 != null and param8 != ''">

Loading…
Cancel
Save