diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java index 13ff19ff4..45db81892 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java @@ -520,6 +520,51 @@ public class EmisWaybillController extends BaseController } + + + @RequestMapping("/updatePrintStatus") + public AjaxResult updatePrintStatus(String billCode) + { + + if(StringUtils.isEmpty(billCode)){ + return AjaxResult.error("参数错误"); + } + + if(!StringUtils.isEmpty(billCode)){ + try { + JSONArray jArr = new JSONArray(); + String[] billCodeArr = billCode.split(","); + + for(String billCodeItem:billCodeArr) { + Map order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, lang, printType); + JSONObject printItem = new JSONObject(); + printItem.put("billCode",billCodeItem); + + if(order!=null) { + printItem.put("billDetail",Base64.getEncoder().encodeToString(JSONObject.toJSONString(order).getBytes(Charset.forName("UTF-8")))); + printItem.put("isEncrpt",false); + printItem.put("printCount",1); + printItem.put("printDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,new Date())); + printItem.put("result","success"); + printItem.put("message","success"); + }else{ + printItem.put("result","fail"); + printItem.put("message","未获取到数据"); + } + jArr.add(printItem); + } + + return AjaxResult.success("获取成功",jArr); + }catch (Exception ex){ + ex.printStackTrace(); + return AjaxResult.error("获取失败"); + } + } + + return AjaxResult.error("获取失败"); + + } + @RequestMapping("/getPrintDataByPrinter") public AjaxResult getPrintDataByPrinter(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange, String lang, String printType) { diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java index a538eb31f..e4b74b035 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java @@ -93,4 +93,6 @@ public interface EmisWaybillMapper extends BaseMapper public int changeOrderStatusByBillCode(EmisWaybill emisWaybill); public int changeOrderStatusByOrderSn(EmisWaybill emisWaybill); + public int updatePrintStatus(EmisWaybill emisWaybill); + } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index fbe0fe6ff..9b7ef935b 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -162,6 +162,16 @@ public class EmisBaseService { return emisWaybillMapper.selectEmisWaybillByBillCode(billCode); } + public void updatePrintStatus(String billCode) { + + EmisWaybill waybill = new EmisWaybill(); + waybill.setBillCode(billCode); + waybill.setPrintManCode(getCurrentUser().getEmpCode()); + emisWaybillMapper.updatePrintStatus(waybill); + + + } + public Map getWaybillPrintOrder(String billCode, String billCodeRange, String lang, String printType){ if(StringUtils.isEmpty(billCode)){ return null; @@ -197,6 +207,13 @@ public class EmisBaseService { order.put("parcel_qty", "1"); order.put("create_day", "2023-12-30"); + if(StringUtils.isEmpty(waybill.getBlPrint())) { + order.put("print_status", "0"); + }else{ + order.put("print_status", waybill.getBlPrint()); + } + + // // order.put("pdf_info","[12312321,123213]"); // order.put("order_sn",waybill.getOrderSn()); diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index c95455498..3a239cd26 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -893,10 +893,18 @@ + + update emis_waybill set bl_print='1',print_man_code=#{printManCode},print_site=#{printSite},print_date=now(),print_count=print_count+1 where bill_code=#{billCode} + + + + update emis_waybill set waybill_status=#{waybillStatus} where bill_code=#{billCode} + + update emis_waybill set order_status=#{orderStatus} where bill_code=#{billCode}