| src/main/java/zy/cloud/wms/common/service/erp/ErpService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/static/js/order/order.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/order/order.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/zy/cloud/wms/common/service/erp/ErpService.java
@@ -1,78 +1,73 @@ //package zy.cloud.wms.common.service.erp; // //import com.alibaba.fastjson.JSON; //import com.core.common.Cools; //import com.core.common.DateUtils; //import com.core.common.SnowflakeIdWorker; //import lombok.extern.slf4j.Slf4j; //import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.stereotype.Service; //import zy.cloud.wms.common.model.BillDto; //import zy.cloud.wms.common.service.erp.entity.UploadBill; //import zy.cloud.wms.common.service.erp.entity.UploadBillDetail; //import zy.cloud.wms.manager.utils.HttpHandler; // //import java.util.ArrayList; //import java.util.Date; //import java.util.List; // ///** // * Created by vincent on 2021/3/23 // */ //@Slf4j //@Service("erpService") //public class ErpService { // // @Autowired // private SnowflakeIdWorker snowflakeIdWorker; // // /** // * 单据上报 // */ // public Boolean uploadBill(List<BillDto> dtos, Integer docId, String docNumber){ // if (true) { //// return true; // } // try { // if (Cools.isEmpty(dtos)) { // return false; // } // UploadBill uploadBill = new UploadBill(); // uploadBill.setNumber(docNumber); // uploadBill.setBillDate(DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F)); // uploadBill.setBTypeID("SHHT"); // uploadBill.setKTypeID("宏挺仓库"); // uploadBill.setVchType(docId); // List<UploadBillDetail> detail = new ArrayList<>(); // uploadBill.setDetail(detail); // for (BillDto dto : dtos) { // UploadBillDetail detl = new UploadBillDetail(); // detl.setUserCode(dto.getMatnr()); // detl.setQty(dto.getQty()); // detl.setPrice(0); // detail.add(detl); // } // System.out.println(JSON.toJSONString(uploadBill)); // String response = new HttpHandler.Builder() // .setUri(ErpScheduler.URI) // .setPath(ErpScheduler.UPLOAD_BILL) // .setJson(JSON.toJSONString(uploadBill)) // .build() // .doPost(); // // if (!Cools.isEmpty(response)) { // log.warn(response); // Result result = JSON.parseObject(response, Result.class); // if (result.getCode() != 1) { // return false; // } // } // } catch (Exception e) { // e.printStackTrace(); // return false; // } // return Boolean.TRUE; // } // // //} package zy.cloud.wms.common.service.erp; import com.alibaba.fastjson.JSON; import com.core.common.Cools; import com.core.common.DateUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import zy.cloud.wms.common.model.BillDto; import zy.cloud.wms.common.service.erp.entity.UploadBill; import zy.cloud.wms.common.service.erp.entity.UploadBillDetail; import zy.cloud.wms.manager.utils.HttpHandler; import java.util.ArrayList; import java.util.Date; import java.util.List; /** * Created by vincent on 2021/3/23 */ @Slf4j @Service("erpService") public class ErpService { /** * 单据上报 */ public Boolean uploadBill(List<BillDto> dtos, Integer docId, String docNumber){ if (true) { // return true; } try { if (Cools.isEmpty(dtos)) { return false; } UploadBill uploadBill = new UploadBill(); uploadBill.setNumber(docNumber); uploadBill.setBillDate(DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F)); uploadBill.setBTypeID("SHHT"); uploadBill.setKTypeID("宏挺仓库"); uploadBill.setVchType(docId); List<UploadBillDetail> detail = new ArrayList<>(); uploadBill.setDetail(detail); for (BillDto dto : dtos) { UploadBillDetail detl = new UploadBillDetail(); detl.setUserCode(dto.getMatnr()); detl.setQty(dto.getQty()); detl.setPrice(0); detail.add(detl); } System.out.println(JSON.toJSONString(uploadBill)); String response = new HttpHandler.Builder() .setUri(ErpScheduler.URI) .setPath(ErpScheduler.UPLOAD_BILL) .setJson(JSON.toJSONString(uploadBill)) .build() .doPost(); if (!Cools.isEmpty(response)) { log.warn(response); Result result = JSON.parseObject(response, Result.class); if (result.getCode() != 1) { return false; } } } catch (Exception e) { e.printStackTrace(); return false; } return Boolean.TRUE; } } src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -9,9 +9,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import zy.cloud.wms.common.model.BillDto; import zy.cloud.wms.common.model.MatnrDto; import zy.cloud.wms.common.model.OrderStoDto; import zy.cloud.wms.common.service.MainService; import zy.cloud.wms.common.service.erp.ErpService; import zy.cloud.wms.common.utils.VersionUtils; import zy.cloud.wms.manager.entity.*; import zy.cloud.wms.manager.entity.param.*; @@ -51,6 +53,8 @@ private ItemService itemService; @Autowired private CstmrService cstmrService; @Autowired private ErpService erpService; @Override @Transactional @@ -96,6 +100,30 @@ throw new CoolException("新增库存明细档失败"); } } } // 上报给erp List<BillDto> dtos = new ArrayList<>(); for (MatnrDto dto : param.getMats()) { BillDto billDto = new BillDto(); billDto.setMatnr(dto.getMatnr()); billDto.setQty(dto.getCount()); dtos.add(billDto); } Integer docId = Optional.ofNullable(param.getDocType()).orElse(34); String docNum = String.valueOf(snowflakeIdWorker.nextId()); switch (docId) { case 34: // 采购单 docNum = "PU-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15); break; case 45: // 销售退货单 docNum = "SR-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15); break; default: break; } if (!erpService.uploadBill(dtos, docId, docNum)) { throw new CoolException("无法上报至erp"); } return R.ok("入库成功"); @@ -160,6 +188,18 @@ } } // 上报给erp List<BillDto> dtos = new ArrayList<>(); for (Comb comb : combs) { BillDto billDto = new BillDto(); billDto.setMatnr(comb.getMatnr()); billDto.setQty(comb.getAnfme()); dtos.add(billDto); } if (!erpService.uploadBill(dtos, param.getDocType(), docNum)) { throw new CoolException("无法上报至erp"); } return R.ok(); } @@ -666,6 +706,16 @@ if (!checkService.updateById(check)) { throw new CoolException("修改盘点记录状态失败"); } // 上报给erp List<BillDto> dtos = new ArrayList<>(); BillDto billDto = new BillDto(); billDto.setMatnr(check.getMatnr()); billDto.setQty(Math.abs(check.getDiffQty())); dtos.add(billDto); if (!erpService.uploadBill(dtos, docId.intValue(), docNum)) { throw new CoolException("无法上报至erp"); } return R.ok(); }
@@ -155,7 +155,7 @@ headers: {token: localStorage.getItem('token')}, url: baseUrl+'/order/list/auth', page: true, limit: 16, limit: 10, limits: [16, 30, 50, 100, 200, 500], toolbar: '#orderToolbar', height: 'full-100', @@ -164,8 +164,8 @@ // ,{field: 'uuid', align: 'center',title: '编号'} ,{field: 'docType$', align: 'center',title: '类别', templet: '#docTypeTpl', width: 100} ,{field: 'orderNo', align: 'center',title: '单据编号', minWidth: 250} ,{field: 'orderTime', align: 'center',title: '单据日期'} ,{field: 'itemName', align: 'center',title: '项目'} ,{field: 'orderTime', align: 'center',title: '单据日期', width: 120} ,{field: 'itemName', align: 'center',title: '项目', hide: true} ,{field: 'allotItemId$', align: 'center',title: '调拨项目编号', hide: true} ,{field: 'defNumber', align: 'center',title: '初始票据号', hide: true} ,{field: 'number', align: 'center',title: '票据号', hide: true} src/main/webapp/views/order/order.html
@@ -132,6 +132,8 @@ class="layui-badge layui-badge-gray" {{# } else if(d.settle === 4){ }} class="layui-badge layui-badge-green" {{# } else if(d.settle === 6){ }} class="layui-badge layui-badge-gray" {{# } }} >{{d.settle$}}</span> </script>
