root/hl_zgbz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
loujf
2022-06-07 09:05:00 +08:00
parent 4ee29d47b1 9fb1f7472c
commit 3eb6d39aba
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java
View File

@@ -63,13 +63,13 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
} }
public synchronized void reload() { public synchronized void reload() {
this.order = this.queryAllOrder("(order_status !='07' or order_status !='08' ) and is_deleted =0"); this.order = this.queryAllOrder("(order_status !='07' and order_status !='08' and order_status !='09') and is_deleted =0");
} }
@Override @Override
public Map<String, Object> queryAll(Map whereJson, Pageable page) { public Map<String, Object> queryAll(Map whereJson, Pageable page) {
WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorder"); WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorder");
String where = "1=1 and is_deleted= '0' and (order_status !='07' or order_status !='08' or order_status !='09' )"; String where = "1=1 and is_deleted= '0' and (order_status !='07' and order_status !='08' and order_status !='09' )";
ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), where, "order_id desc"); ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), where, "order_id desc");
final JSONObject json = rb.pageResult(); final JSONObject json = rb.pageResult();
JSONArray newja = new JSONArray(); JSONArray newja = new JSONArray();
@@ -457,12 +457,12 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
public void cancel(String id) { public void cancel(String id) {
ProduceshiftorderDto entity = this.findById(id); ProduceshiftorderDto entity = this.findById(id);
if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!");
entity.setIs_deleted("1"); entity.setOrder_status("09");
WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorder"); WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorder");
JSONObject json= (JSONObject) JSONObject.toJSON(entity); JSONObject json= (JSONObject) JSONObject.toJSON(entity);
wo.update(json); wo.update(json);
HashMap<String, String> map = new HashMap<>(); HashMap<String, String> map = new HashMap<>();
map.put("order_status","09"); map.put("order_detail_status","07");
WQLObject.getWQLObject("acs_produceshiftorderdetail").update(map,"order_id = '"+ id + "'"); WQLObject.getWQLObject("acs_produceshiftorderdetail").update(map,"order_id = '"+ id + "'");
} }

2
nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderdetailServiceImpl.java
View File

@@ -206,7 +206,7 @@ public class ProduceshiftorderdetailServiceImpl implements Produceshiftorderdeta
} }
public synchronized void reload() { public synchronized void reload() {
this.detail = this.queryAllOrderDteail(" (order_detail_status != '04' or order_detail_status != '05') and is_deleted =0"); this.detail = this.queryAllOrderDteail(" (order_detail_status != '05' and order_detail_status != '06' and order_detail_status != '07') and is_deleted =0");
} }
@Override @Override