src/main/java/com/zy/asrs/controller/OpenController.java
@@ -51,7 +51,7 @@ public synchronized R syncStockUpload(@RequestHeader(required = false) String appkey, @RequestBody(required = false) List<MatSyncParam> param, HttpServletRequest request){ // auth(appkey, param, request); auth(appkey, param, request); if (Cools.isEmpty(param)) { return R.parse(BaseRes.PARAM); } @@ -81,6 +81,7 @@ * 添加入库单 */ @PostMapping("/pakin/execute/auth/v1") @AppAuth(memo = "添加入库单") public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey, @RequestBody OpenOrderPakinParam param, HttpServletRequest request) { src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -3,7 +3,10 @@ import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; import com.core.common.Cools; import com.core.common.SpringUtils; import com.zy.common.utils.Synchro; import com.zy.system.entity.User; import com.zy.system.service.UserService; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -177,7 +180,14 @@ return String.valueOf(this.source); } } public String getModiUser$(){ UserService service = SpringUtils.getBean(UserService.class); User user = service.selectById(this.modiUser); if (!Cools.isEmpty(user)){ return String.valueOf(user.getUsername()); } return null; } public String getInspect$(){ if (null == this.inspect){ return null; } switch (this.inspect){ src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -3,6 +3,9 @@ import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableName; import com.core.common.Cools; import com.core.common.SpringUtils; import com.zy.system.entity.User; import com.zy.system.service.UserService; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -215,4 +218,13 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime); } public String getModiUser$(){ UserService service = SpringUtils.getBean(UserService.class); User user = service.selectById(this.modiUser); if (!Cools.isEmpty(user)){ return String.valueOf(user.getUsername()); } return null; } } src/main/java/com/zy/asrs/entity/result/OrderRsult.java
@@ -34,6 +34,7 @@ public String cirdcode; public String codepcode; public String cidepcode; public String wms_operator; } @Data src/main/java/com/zy/asrs/service/OrderService.java
@@ -16,7 +16,7 @@ boolean updateSettle(Long orderId, Long settle, Long userId); void checkComplete(String orderNo); void checkComplete(String orderNo,WrkDetl wrkDetl); boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls);
@@ -132,6 +132,7 @@ orderDetl.setQty(0.0D); orderDetl.setWorkQty(0.0D); orderDetl.setUnits(0.0); orderDetl.setMemo(detlDto.getMemo()); if (!orderDetlService.insert(orderDetl)) { throw new CoolException("生成单据明细失败，请联系管理员"); } @@ -269,6 +270,7 @@ orderDetl.setQty(0.0D); orderDetl.setWorkQty(0.0D); orderDetl.setUnits(0.0); orderDetl.setMemo(detlDto.getMemo()); if (!orderDetlService.insert(orderDetl)) { throw new CoolException("生成单据明细失败，请联系管理员"); } src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -19,11 +19,14 @@ import com.zy.asrs.service.OrderService; import com.zy.common.model.DetlDto; import com.zy.common.utils.HttpHandler; import com.zy.system.entity.User; import com.zy.system.service.UserService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.text.Format; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -39,12 +42,23 @@ @Autowired private OrderDetlService orderDetlService; @Resource private UserService userService; @Autowired private ApiLogService apiLogService; @Value("${erp.switch.ReviewOrderSwitch}") private Boolean switchReviewOrderSwitch; @Value("${erp.address.URL}") private String URL; @Value("${erp.address.sServer}") private String sServer; @Value("${erp.address.sAccID}") private String sAccID; @Value("${erp.address.sUserID}") private String sUserID; @Value("${erp.address.sPassword}") private String sPassword; @Value("${erp.address.inaddressSave}") private String inaddressSave; @Value("${erp.address.outaddressSave}") @@ -140,10 +154,10 @@ OrderRsult.Login login = new OrderRsult.Login(); OrderRsult.HeadTable headTable = new OrderRsult.HeadTable(); OrderRsult.BodyTable bodyTable = new OrderRsult.BodyTable(); login.setSAccID("999"); //账套号 固定 login.setSUserID("sys");//U8登陆账号 固定 login.setSPassword("123456");//U8登陆密码 固定 login.setSServer("10.1.9.20");//U8服务器地址 固定 login.setSAccID(sAccID); //账套号 固定 login.setSUserID(sUserID);//U8登陆账号 固定 login.setSPassword(sPassword);//U8登陆密码 固定 login.setSServer(sServer);//U8服务器地址 固定 orderRsult.setLogin(login); orderRsult.setVerifier("sys");//单据类型 固定 orderRsult.setCommandType(sts.equals(1) ? "新增" : "关闭");//操作类型 固定 @@ -158,8 +172,8 @@ headTable.setCmaker("sys");//制单人名称 headTable.setVt_id("89");//模板号 默认 headTable.setCiwhcode("");//转入仓库编码 headTable.setCowhcode("");//转出仓库编码 headTable.setCiwhcode("1");//转入仓库编码 headTable.setCowhcode("1");//转出仓库编码 headTable.setCordcode("");//出库类别编码 默认 headTable.setCirdcode("");//入库类别编码 默认 headTable.setCodepcode("");//转出部门编码 @@ -176,9 +190,18 @@ bodyTable.setCoutposcode("");//目标货位 bodyTable.setItrsid(orderDetl.getMemo());//行主键 bodyTable.setEditprop(sts.equals(1) ? "A" : "B");//状态 A 新增 User user = userService.selectById(orderDetl.getUpdateBy()); headTable.setWms_operator(user == null ? "" : user.getUsername()); // 操作账号名称 ArrayList<OrderRsult.BodyTable> bodyTables = new ArrayList<>(); bodyTables.add(bodyTable); orderRsult.setBodyTable(bodyTables); if (order.getDocType()>10L) { ArrayList<OrderRsult.HeadTable> headTables = new ArrayList<>(); headTables.add(headTable); orderRsult.setHeadTable(headTables); if (order.getDocType() == 34L) { ERPPath=outaddressSave; } ERPName=order.getDocType$(); @@ -196,7 +219,7 @@ System.out.println("response:"+response); JSONObject jsonObject = JSON.parseObject(response); if (jsonObject.getInteger("code").equals(200)) { if (jsonObject.getInteger("code").equals(1)) { orderDetl.setUnits(qty+orderDetl.getUnits()); orderDetl.setStatus(sts); orderDetlService.updateById(orderDetl); src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -58,7 +58,7 @@ } @Override public void checkComplete(String orderNo) { public void checkComplete(String orderNo,WrkDetl wrkDetl) { Order order = this.selectByNo(orderNo); if (Cools.isEmpty(order) || order.getSettle() >= 4L) { return; @@ -76,10 +76,15 @@ if (Objects.equals(orderDetl.getAnfme(), orderDetl.getQty())&& orderDetl.getQty()>orderDetl.getUnits() &&orderDetl.getInspect()<2) { if (order.getDocType() == 33) { // 只有调拨入库单上报 33.调拨入库单 orderDetl.setInspect(2);//等待上报 orderDetl.setUpdateBy(wrkDetl.getAppeUser()); orderDetl.setUpdateTime(wrkDetl.getAppeTime()); orderDetlService.updateById(orderDetl); } } } if (complete) { if (!this.updateSettle(order.getId(), 4L, null)) { throw new CoolException("修改订单【orderNo = " + order.getOrderNo() + "】状态为已完成失败"); src/main/java/com/zy/asrs/task/AutoReportingScheduler.java
@@ -14,6 +14,7 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.List; @Component @@ -23,9 +24,10 @@ private OrderService orderService; @Resource private OrderDetlService orderDetlService; @Scheduled(cron = "0/3 * * * * ? ") @Scheduled(cron = "0/30 * * * * ? ") private void execute(){ List< OrderDetl> orderDetls=orderDetlService.selectList(new EntityWrapper<OrderDetl>() .eq("status",1) @@ -34,7 +36,7 @@ return; } for (OrderDetl orderDetl : orderDetls) { orderDetlService.U8Reporting(orderDetl.getId(),1); orderDetlService.U8Reporting(orderDetl.getId(),0); } } } src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -49,7 +49,7 @@ while (iterator.hasNext()) { WrkDetl wrkDetl = iterator.next(); if (!Cools.isEmpty(wrkDetl.getOrderNo())) { orderService.checkComplete(wrkDetl.getOrderNo()); orderService.checkComplete(wrkDetl.getOrderNo(),wrkDetl); iterator.remove(); } } src/main/resources/application.yml
@@ -11,6 +11,8 @@ datasource: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver url: jdbc:sqlserver://127.0.0.1:1433;databasename=dlzasrs #测试数据库 # url: jdbc:sqlserver://127.0.0.1:1433;databasename=dlznewasrs username: sa password: sa@123 mvc: @@ -79,10 +81,20 @@ ReviewOrderSwitch: false # 地址 address: URL: http://158.210.10.90:28090 # #单据，商品档案地址 # inaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery.common.kdsvc #正式 # URL: http://10.10.0.34:33117 # sServer: 10.10.0.34 # sAccID: (default)@980 # sUserID: PW008 # sPassword: D#012332. #测试 URL: http://10.10.0.34:33117 sServer: 10.10.0.10 sAccID: (default)@980 sUserID: PW008 sPassword: D#012332. #入库结果上报（提交）单地址 inaddressSave: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save.common.kdsvc inaddressSave: api/U8Voucher #出库结果上报（提交）单地址 outaddressSave: K3Cloud/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit.common.kdsvc src/main/webapp/static/js/order/order.js
@@ -136,7 +136,8 @@ // }, // {field: 'inQty', title: '已入库量'}, // {field: 'color', title: '颜色'}, {field: 'specs', title: '规格'} {field: 'specs', title: '规格'}, {field: 'memo', title: '备注'} ]], request: { pageName: 'curr',
