mes-basic/src/main/java/com/chinaztt/mes/basic/mapper/StaffMapper.java
@@ -29,6 +29,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; /** * 员工 @@ -86,4 +87,6 @@ List<Staff> selectListAll(); Staff getStaffByUserId(Integer userId); List<Map<String, Object>> chooseStaff(); } mes-basic/src/main/java/com/chinaztt/mes/basic/service/StaffService.java
@@ -26,6 +26,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; /** * 员工 @@ -61,4 +62,6 @@ * @param list */ void importWorkstationExcel(List<StaffData> list); List<Map<String,Object>> chooseStaff(); } mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/StaffServiceImpl.java
@@ -31,6 +31,7 @@ import org.springframework.stereotype.Service; import java.util.List; import java.util.Map; import java.util.Objects; /** @@ -137,4 +138,9 @@ baseMapper.insert(staff); } } @Override public List<Map<String, Object>> chooseStaff() { return baseMapper.chooseStaff(); } } mes-basic/src/main/resources/mapper/StaffMapper.xml
@@ -115,4 +115,8 @@ where u.user_id = #{userId} </select> <select id="chooseStaff" resultType="java.util.Map"> select id,staff_no "staffNo", staff_name "staffName" from basic_staff </select> </mapper> mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java
@@ -20,6 +20,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaztt.mes.basic.service.StaffService; import com.chinaztt.mes.common.wrapper.QueryWrapperUtil; import com.chinaztt.mes.plan.dto.*; import com.chinaztt.mes.plan.entity.CustomerOrder; @@ -87,6 +88,8 @@ private final SysDictItemService sysDictItemService; private final StaffService staffService; /** * 分页查询 * @@ -97,8 +100,29 @@ @ApiOperation(value = "分页查询", notes = "分页查询") @GetMapping("/page/{type}") public R getCustomerOrderPage(Page page, CustomerOrderDTO planCustomerOrder, @PathVariable("type") String type) { log.info("条件=================》"+ JSONObject.toJSONString(planCustomerOrder)); return R.ok(customerOrderService.getCustomerOrderPage(page, QueryWrapperUtil.gen(planCustomerOrder), type)); } /** * 同步otc订单数据 * * @param selectTime 选择日期，查询该日期后至当前时间的数据 * @param orderNo 订单编号 * @return */ @GetMapping("/otcCustomerOrderSync") public R otcCustomerOrderSync(@RequestParam("selectTime") String selectTime, @RequestParam("orderNo") String orderNo) { return customerOrderService.otcCustomerOrderSync(selectTime, orderNo); } /** *选择绑定人员 * @return */ @ApiOperation(value = "选择绑定人员", notes = "选择绑定人员") @GetMapping("/chooseStaff") public R chooseStaff() { return R.ok(staffService.chooseStaff()); } /** @@ -303,19 +327,6 @@ public R validatePackageCodeSnCustomerOrder(@RequestBody PackagingDTO packagingDTO) { return R.ok(customerOrderService.validatePackageCodeSnCustomerOrder(packagingDTO)); } /** * 同步otc订单数据 * * @param selectTime 选择日期，查询该日期后至当前时间的数据 * @param orderNo 订单编号 * @return */ @GetMapping("/otcCustomerOrderSync") public R otcCustomerOrderSync(@RequestParam("selectTime") String selectTime, @RequestParam("orderNo") String orderNo) { return customerOrderService.otcCustomerOrderSync(selectTime, orderNo); } /** * 更新订单行说明 mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerOrderServiceImpl.java
@@ -709,9 +709,6 @@ .contentType("application/json") .header("Authorization", "Bearer " + token).form(map).execute().body(); JSONObject result = JSONObject.parseObject(str); log.info("主表长度============================================>"+result.getJSONArray("data").size()); //jsonArray.forEach(); //return null; //主表参数表 List<OrderParam> orderParams = orderParamService.list(); if (result.getInteger("code") == 0) { @@ -836,7 +833,7 @@ customerOrder = new CustomerOrder(); } //如果这个单子在OTC中取消状态 那就删除 if (otcOrderStatus.equals("已取消")) { if (otcOrderStatus.equals(OTC_MAIN_STATUS_CANCEL)) { if (customerOrder.getId() != null) { baseMapper.deleteById(customerOrder.getId()); } @@ -924,7 +921,7 @@ } else { customerOrder.setCoState(CustomerOrderStateStringValues.PARTUNCHECKED); } if (org.apache.commons.lang3.StringUtils.equals("已下达", otcMainStatus)) { if (org.apache.commons.lang3.StringUtils.equals(OTC_MAIN_STATUS_TRANSMIT, otcMainStatus)) { customerOrder.setCoState(CustomerOrderStateStringValues.TECHNOLOGYUNCHECK); customerOrder.setOtcPartSync(Boolean.TRUE); } @@ -933,8 +930,8 @@ customerOrder.setCoState(CustomerOrderStateStringValues.TECHNOLOGYUNCHECK); customerOrder.setOtcPartSync(Boolean.TRUE); } //审核状态为 01draft 草稿 customerOrder.setIsAudit(AuditStateStringValues.DRAFT); //审核状态为 03accepted 通过 customerOrder.setIsAudit(AuditStateStringValues.ACCEPTED); baseMapper.insert(customerOrder); } addCustomerPara(customerJSONObject, customerOrderJSONObject, customerOrder, orderParamList);
