Yangwl
/
lanju-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
Yangwl 1 year ago
parent 6db6289d4d 5e11d53783
commit 4e04cf0560
38 changed files with 1400 additions and 615 deletions
Show Stats Download Patch File Download Diff File

2
op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java
Unescape Escape View File

@ -52,7 +52,7 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService {
/** /**
* 获取设备信息 * 获取设备信息
* 故障停机率:（设备停机时间总和/一定时间内运行总时间（年）） * 故障停机率:（设备停机时间总和/一定时间内运行总时间（今年运行的时间））
* 设备有效利用率：（实际产量/理论产量）改为：一定天数内该设备的总开机时间/（天数*24小时） * 设备有效利用率：（实际产量/理论产量）改为：一定天数内该设备的总开机时间/（天数*24小时）
* *
* @return * @return

10
op-modules/op-device/src/main/java/com/op/device/service/impl/EquSpotCheckServiceImpl.java
Unescape Escape View File

@ -123,8 +123,9 @@ public class EquSpotCheckServiceImpl implements IEquSpotCheckService {
* @return * @return
*/ */
private AjaxResult formatEquItemCommon(List<EquPlanEqu> equPlanEquList, String planType, String message) { private AjaxResult formatEquItemCommon(List<EquPlanEqu> equPlanEquList, String planType, String message) {
//没有点检项的设备
String equipmentList = "";
for (EquPlanEqu data : equPlanEquList) { for (EquPlanEqu data : equPlanEquList) {
// 检查项名称临时对象 // 检查项名称临时对象
StringBuilder itemTempName = new StringBuilder(); StringBuilder itemTempName = new StringBuilder();
@ -169,9 +170,14 @@ public class EquSpotCheckServiceImpl implements IEquSpotCheckService {
data.setItemTempName(itemTempName.toString());//处理好的检查项名称置入检查项名称（用于前端信息回显） data.setItemTempName(itemTempName.toString());//处理好的检查项名称置入检查项名称（用于前端信息回显）
} else { } else {
// 未查询到对应检查项信息 // 未查询到对应检查项信息
return error(500, message); equipmentList = equipmentList + '[' + data.getEquipmentCode() + "]";
} }
} }
if(!equipmentList.equals("")){
equipmentList = equipmentList + "设备未查询到对应检查项信息!";
message = equipmentList;
return error(500, message);
}
return success(equPlanEquList); return success(equPlanEquList);
} }

4
op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml
Unescape Escape View File

@ -48,8 +48,8 @@
be.equipment_name AS 'equipmentName', be.equipment_name AS 'equipmentName',
be.equipment_status AS 'equipmentStatus', be.equipment_status AS 'equipmentStatus',
be.department AS 'department', be.department AS 'department',
ROUND(SUM(CAST(eo.fault_time AS FLOAT)) * 100 / SUM(CAST(eo.actual_operation_time AS FLOAT)),2) AS 'failureRate', ROUND(SUM(CAST(eo.fault_time AS FLOAT)) * 100 / SUM(CAST(eo.operation_time AS FLOAT)),2) AS 'failureRate',
CAST(SUM(CAST(eo.actual_operation_time AS DECIMAL(10,2)))*100 / (365*24) AS DECIMAL(18,2)) AS 'utilizationRatio' CAST(SUM(CAST(eo.actual_operation_time AS DECIMAL(10,2)))*100/(COUNT(eo.actual_operation_time)*24) AS DECIMAL(18,2)) AS 'utilizationRatio'
FROM equ_operation eo FROM equ_operation eo
LEFT JOIN base_equipment be ON eo.equipment_code = be.equipment_code LEFT JOIN base_equipment be ON eo.equipment_code = be.equipment_code
<where> <where>

19
op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java
Unescape Escape View File

@ -191,9 +191,26 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
totals = mesMapper.getTotalNum(boardDTO); totals = mesMapper.getTotalNum(boardDTO);
everys = mesMapper.getEveryNum(boardDTO); everys = mesMapper.getEveryNum(boardDTO);
} }
/**质量看板测试开始**/
if("equ_type_spj".equals(boardDTO.getEquTypeCode())){
boardDTO.setEquTypeCode("equ_type_hf");
totals = mesMapper.getTotalNum(boardDTO);
for(BoardDTO total:totals){
total.setTotalNum(total.getTotalNum()-2);
total.setEquTypeCode(total.getEquTypeCode().replace("H","X"));
total.setEquTypeName(total.getEquTypeName().replace("烘房","收坯机"));
}
everys = mesMapper.getEveryNum(boardDTO);
for(BoardDTO every:everys){
every.setTotalNum(every.getTotalNum()-2);
every.setEquCode(every.getEquCode().replace("H","X"));
every.setEquName(every.getEquName().replace("烘房","收坯机"));
}
}
/**质量看板测试结束**/
boardMap.put("totalNum", totals); boardMap.put("totalNum", totals);
boardMap.put("everyNum", everys); boardMap.put("everyNum", everys);
return boardMap; return boardMap;
} }

18
op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderController.java
Unescape Escape View File

@ -284,5 +284,21 @@ public class ProOrderController extends BaseController {
public R syncSAPOrders() { public R syncSAPOrders() {
return proOrderService.syncSAPOrders(); return proOrderService.syncSAPOrders();
} }
/**
* 下发生产工单。workorderIds：母工单号
*/
@RequiresPermissions("mes:pro:order:edit")
@Log(title = "关闭订单", businessType = BusinessType.OTHER)
@PostMapping("/deleteOrder/{orderIds}")
public AjaxResult deleteOrder(@PathVariable String[] orderIds) {
int m = proOrderService.deleteOrder(orderIds);
if(m==2){
//有活动中的单
return AjaxResult.error("订单拆分成的工单，已经进行生产，不允许关闭，请联系系统管理员！");
}else if(m==1){
return AjaxResult.success("订单关闭成功");
}else{
return AjaxResult.error();
}
}
} }

3
op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderMapper.java
Unescape Escape View File

@ -142,7 +142,8 @@ public interface ProOrderMapper {
*/ */
public List<ProLine> selectPackageLine(); public List<ProLine> selectPackageLine();
public void updateOrderBatch(@Param("workers") List<ProOrderWorkorder> workers); public int updateOrderBatch(@Param("workers") List<ProOrderWorkorder> workers);
public int updateCloseOrderBatch(@Param("workers") List<ProOrderWorkorder> workers);
/** /**
* 通过id查询班次名称 * 通过id查询班次名称

6
op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java
Unescape Escape View File

@ -184,5 +184,11 @@ public interface ProOrderWorkorderMapper {
ProOrderWorkorder getSonWorkOrder(ProOrderWorkorder whiteOrder); ProOrderWorkorder getSonWorkOrder(ProOrderWorkorder whiteOrder);
ProOrderWorkorder selectSonWorkOrder(String workorderCode); ProOrderWorkorder selectSonWorkOrder(String workorderCode);
List<ProOrderWorkorder> getWorkOrderByOrders(@Param("orderIds")String[] orderIds);
int deletePrepareBatch(@Param("workorders")List<String> workorders);
int deletePrepareDetailBatch(@Param("workorders")List<String> workorders);
} }

2
op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderService.java
Unescape Escape View File

@ -141,4 +141,6 @@ public interface IProOrderService {
AjaxResult getCascadeProOrder(String orderCode); AjaxResult getCascadeProOrder(String orderCode);
int getProSortNo(ProOrder proOrder); int getProSortNo(ProOrder proOrder);
int deleteOrder(String[] orderCodes);
} }

82
op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
Unescape Escape View File

@ -32,6 +32,7 @@ import com.op.system.api.RemoteSapService;
import com.op.system.api.RemoteUserService; import com.op.system.api.RemoteUserService;
import com.op.system.api.domain.SysSapLog; import com.op.system.api.domain.SysSapLog;
import com.op.system.api.domain.SysUser; import com.op.system.api.domain.SysUser;
import com.op.system.api.domain.sap.SapCloseOrderQuery;
import com.op.system.api.domain.sap.SapShopOrderQuery; import com.op.system.api.domain.sap.SapShopOrderQuery;
import com.op.system.api.model.SapProOrder; import com.op.system.api.model.SapProOrder;
import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.lang3.time.DateFormatUtils;
@ -1084,6 +1085,87 @@ public class ProOrderServiceImpl implements IProOrderService {
} }
return success(); return success();
} }
@Override
@DS("#header.poolName")
@Transactional(rollbackFor = Exception.class)
public int deleteOrder(String[] orderIds) {
//可以进行订单关闭的数据
List<ProOrderWorkorder> checkWorkOrders = proOrderWorkorderMapper.getWorkOrderByOrders(orderIds);
if(checkWorkOrders.size() != orderIds.length){
return 2;
}
for(ProOrderWorkorder workorder:checkWorkOrders){
//要删除的工单id们
List<String> delteIds = new ArrayList<>();
delteIds.add(workorder.getWorkorderId());
//关闭订单用
List<String> ordercodes = new ArrayList<>();
ordercodes.add(workorder.getWorkorderCodeSap());
//删领料单用
List<String> workorderCodes = new ArrayList<>();
workorderCodes.add(workorder.getWorkorderCode());
//删除订单
List<ProOrderWorkorder> workers = new ArrayList<>();
workers.add(workorder);
ProOrderWorkorder topWork = workorder;
Boolean run = true;
while (run) {
//下级
ProOrderWorkorder sonWorkers = proOrderWorkorderMapper.selectSonWorkOrder(topWork.getWorkorderCode());
//有上级code
if (sonWorkers != null) {
workers.add(sonWorkers);
delteIds.add(sonWorkers.getWorkorderId());
ordercodes.add(sonWorkers.getWorkorderCodeSap());
workorderCodes.add(sonWorkers.getWorkorderCode());
topWork.setWorkorderCode(sonWorkers.getWorkorderCode());
} else {
run = false;
}
}
//调用sap订单关闭接口
//关闭母子订单//订单的订单编码(关闭订单暂时隐藏)
SapCloseOrderQuery sapCloseOrderQuery = new SapCloseOrderQuery();
sapCloseOrderQuery.setOrderCodes(ordercodes);
R closeR= remoteSapService.sapCloseOrder(sapCloseOrderQuery);
logger.info(workorderCodes.get(0)+"删除订单后关闭订单"+
JSONObject.toJSONString(sapCloseOrderQuery)+
closeR.getCode()+","+
closeR.getMsg()+","+
closeR.getData());
//if(closeR.getCode()==200){
String[] workorderIds = (String[]) delteIds.toArray(new String[delteIds.size()]);
if (workorderIds.length > 0) {
//删除工单(字母)pro_order_workorder
int m1 = proOrderWorkorderMapper.deleteProOrderWorkorderByWorkorderIds(workorderIds);
logger.info(workorderCodes.get(0)+"删除订单m1:"+m1);
//删除批次pro_order_workorder_batch
int m2 = proOrderWorkorderBatchMapper.deleteBatch(workorderIds);
logger.info(workorderCodes.get(0)+"删除订单m2:"+m2);
//删除领料单mes_prepare
int m3 = proOrderWorkorderMapper.deletePrepareBatch(workorderCodes);
logger.info(workorderCodes.get(0)+"删除订单m3:"+m3);
//删除领料单明细mes_prepare_detail
int m4 = proOrderWorkorderMapper.deletePrepareDetailBatch(workorderCodes);
logger.info(workorderCodes.get(0)+"删除订单m4:"+m4);
}
if (!CollectionUtils.isEmpty(workers)) {
//删除订单pro_order
int m5 = proOrderMapper.updateCloseOrderBatch(workers);
logger.info(workorderCodes.get(0)+"删除订单m5:"+m5);
}
// }else{
// logger.info(workorder.getWorkorderCode()+"删除订单后关闭订单sap返回结果："+
// JSONObject.toJSONString(closeR));
// return 0;
// }
}
return 1;
}
public static void main(String args[]){ public static void main(String args[]){
String arrayStr = "[[\"GX01\",\"LG1\"],[\"GX01\",\"LG2\"],[\"GX02\",\"S1\"],[\"GX02\",\"S2\"],[\"GX03\",\"HF01\"],[\"GX04\",\"SPJ01\"]]"; String arrayStr = "[[\"GX01\",\"LG1\"],[\"GX01\",\"LG2\"],[\"GX02\",\"S1\"],[\"GX02\",\"S2\"],[\"GX03\",\"HF01\"],[\"GX04\",\"SPJ01\"]]";
JSONArray jsonArray = JSONArray.parseArray(arrayStr); JSONArray jsonArray = JSONArray.parseArray(arrayStr);

8
op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml
Unescape Escape View File

@ -321,7 +321,13 @@
where id = #{worker.orderId} where id = #{worker.orderId}
</foreach> </foreach>
</update> </update>
<update id="updateCloseOrderBatch">
<foreach collection="workers" item="worker" index="index" separator=";">
update pro_order set del_flag = '1',
update_time = GETDATE()
where id = #{worker.orderId}
</foreach>
</update>
<update id="updateProOrderByOrderCode" parameterType="ProOrder"> <update id="updateProOrderByOrderCode" parameterType="ProOrder">
update pro_order update pro_order
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">

34
op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
Unescape Escape View File

@ -507,6 +507,22 @@
from pro_wet_material_plan_detail from pro_wet_material_plan_detail
where workorder_id = #{workorderId} and del_flag = '0' where workorder_id = #{workorderId} and del_flag = '0'
</select> </select>
<select id="getWorkOrderByOrders" resultType="com.op.plan.domain.ProOrderWorkorder">
select workorder_id workorderId,
workorder_code workorderCode,
order_code orderCode,
order_id orderId,
quantity_split quantitySplit,
workorder_code_sap workorderCodeSap
from pro_order_workorder pow
where pow.order_id in
<foreach item="orderId" collection="orderIds" open="(" separator="," close=")">
#{orderId}
</foreach>
and pow.status in ('w0','w1')
and pow.del_flag = '0'
</select>
<insert id="createPrepareDetails"> <insert id="createPrepareDetails">
insert into mes_prepare_detail insert into mes_prepare_detail
@ -705,4 +721,22 @@
#{orderId} #{orderId}
</foreach> </foreach>
</delete> </delete>
<delete id="deletePrepareBatch">
update mes_prepare
set del_flag = '1',
update_time = GETDATE()
where workorder_code in
<foreach item="workorder" collection="workorders" open="(" separator="," close=")">
#{workorder}
</foreach>
</delete>
<delete id="deletePrepareDetailBatch">
update mes_prepare_detail
set del_flag = '1',
update_time = GETDATE()
where parent_work_order in
<foreach item="workorder" collection="workorders" open="(" separator="," close=")">
#{workorder}
</foreach>
</delete>
</mapper> </mapper>

200
op-modules/op-quality/src/main/java/com/op/quality/controller/QcGoalController.java
Unescape Escape View File

@ -9,7 +9,7 @@ import com.op.common.log.annotation.Log;
import com.op.common.log.enums.BusinessType; import com.op.common.log.enums.BusinessType;
import com.op.common.security.annotation.RequiresPermissions; import com.op.common.security.annotation.RequiresPermissions;
import com.op.quality.domain.QcGoal; import com.op.quality.domain.QcGoal;
//import com.op.quality.service.IQcGoalService; import com.op.quality.service.IQcGoalService;
import com.op.common.core.web.controller.BaseController; import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult; import com.op.common.core.web.domain.AjaxResult;
import com.op.common.core.utils.poi.ExcelUtil; import com.op.common.core.utils.poi.ExcelUtil;
@ -24,103 +24,103 @@ import com.op.common.core.web.page.TableDataInfo;
@RestController @RestController
@RequestMapping("/qcGoal") @RequestMapping("/qcGoal")
public class QcGoalController extends BaseController { public class QcGoalController extends BaseController {
// @Autowired @Autowired
// private IQcGoalService qcGoalService; private IQcGoalService qcGoalService;
//
// /** /**
// * 查询质量目标列表 * 查询质量目标列表
// */ */
// @RequiresPermissions("quality:qcGoal:list") @RequiresPermissions("quality:qcGoal:list")
// @GetMapping("/list") @GetMapping("/list")
// public TableDataInfo list(QcGoal qcGoal) { public TableDataInfo list(QcGoal qcGoal) {
// startPage(); startPage();
// List<QcGoal> list = qcGoalService.selectQcGoalList(qcGoal); List<QcGoal> list = qcGoalService.selectQcGoalList(qcGoal);
// return getDataTable(list); return getDataTable(list);
// } }
//
// /** /**
// * 查询二级质量目标 * 查询二级质量目标
// */ */
// @GetMapping("/getChildrenList/{parentId}") @GetMapping("/getChildrenList/{parentId}")
// public List<QcGoal> getChildrenList(@PathVariable("parentId") String parentId) { public List<QcGoal> getChildrenList(@PathVariable("parentId") String parentId) {
// QcGoal goal = new QcGoal(); QcGoal goal = new QcGoal();
// goal.setParentGoal(parentId); goal.setParentGoal(parentId);
// List<QcGoal> list = qcGoalService.selectChildrenByParent(goal); List<QcGoal> list = qcGoalService.selectChildrenByParent(goal);
// return list; return list;
// } }
//
// /** /**
// * 导出质量目标列表 * 导出质量目标列表
// */ */
// @RequiresPermissions("quality:qcGoal:export") @RequiresPermissions("quality:qcGoal:export")
// @Log(title = "质量目标", businessType = BusinessType.EXPORT) @Log(title = "质量目标", businessType = BusinessType.EXPORT)
// @PostMapping("/export") @PostMapping("/export")
// public void export(HttpServletResponse response, QcGoal qcGoal) { public void export(HttpServletResponse response, QcGoal qcGoal) {
// List<QcGoal> list = qcGoalService.selectQcGoalList(qcGoal); List<QcGoal> list = qcGoalService.selectQcGoalList(qcGoal);
// ExcelUtil<QcGoal> util = new ExcelUtil<QcGoal>(QcGoal. class); ExcelUtil<QcGoal> util = new ExcelUtil<QcGoal>(QcGoal. class);
// util.exportExcel(response, list, "质量目标数据"); util.exportExcel(response, list, "质量目标数据");
// } }
//
// /** /**
// * 获取质量目标详细信息 * 获取质量目标详细信息
// */ */
// @RequiresPermissions("quality:qcGoal:query") @RequiresPermissions("quality:qcGoal:query")
// @GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
// public AjaxResult getInfo(@PathVariable("id") String id) { public AjaxResult getInfo(@PathVariable("id") String id) {
// return success(qcGoalService.selectQcGoalById(id)); return success(qcGoalService.selectQcGoalById(id));
// } }
//
// /** /**
// * 获取质量目标下拉树列表 * 获取质量目标下拉树列表
// */ */
// @GetMapping("/treeSelect") @GetMapping("/treeSelect")
// public AjaxResult treeSelect(QcGoal qcGoal) { public AjaxResult treeSelect(QcGoal qcGoal) {
// List<QcGoal> qcGoals = qcGoalService.selectQcGoalList(qcGoal); List<QcGoal> qcGoals = qcGoalService.selectQcGoalList(qcGoal);
// return success(qcGoalService.buildQcGoalTreeSelect(qcGoals)); return success(qcGoalService.buildQcGoalTreeSelect(qcGoals));
// } }
//
// /** /**
// * 新增质量目标 * 新增质量目标
// */ */
// @RequiresPermissions("quality:qcGoal:add") @RequiresPermissions("quality:qcGoal:add")
// @Log(title = "质量目标", businessType = BusinessType.INSERT) @Log(title = "质量目标", businessType = BusinessType.INSERT)
// @PostMapping @PostMapping
// public AjaxResult add(@RequestBody QcGoal qcGoal) { public AjaxResult add(@RequestBody QcGoal qcGoal) {
// return toAjax(qcGoalService.insertQcGoal(qcGoal)); return toAjax(qcGoalService.insertQcGoal(qcGoal));
// } }
//
// /** /**
// * 拆解质量目标 * 拆解质量目标
// */ */
// @GetMapping("/generate/{id}") @GetMapping("/generate/{id}")
// public TableDataInfo generate(@PathVariable("id") String id) { public TableDataInfo generate(@PathVariable("id") String id) {
// List<QcGoal> qcGoalList = qcGoalService.generate(id); List<QcGoal> qcGoalList = qcGoalService.generate(id);
// return getDataTable(qcGoalList); return getDataTable(qcGoalList);
// } }
//
//
// /** /**
// * 修改质量目标 * 修改质量目标
// */ */
// @RequiresPermissions("quality:qcGoal:edit") @RequiresPermissions("quality:qcGoal:edit")
// @Log(title = "质量目标", businessType = BusinessType.UPDATE) @Log(title = "质量目标", businessType = BusinessType.UPDATE)
// @PutMapping @PutMapping
// public AjaxResult edit(@RequestBody QcGoal qcGoal) { public AjaxResult edit(@RequestBody QcGoal qcGoal) {
// return toAjax(qcGoalService.updateQcGoal(qcGoal)); return toAjax(qcGoalService.updateQcGoal(qcGoal));
// } }
//
// /** /**
// * 删除质量目标 * 删除质量目标
// */ */
// @RequiresPermissions("quality:qcGoal:remove") @RequiresPermissions("quality:qcGoal:remove")
// @Log(title = "质量目标", businessType = BusinessType.DELETE) @Log(title = "质量目标", businessType = BusinessType.DELETE)
// @DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
// public AjaxResult remove(@PathVariable String[] ids) { public AjaxResult remove(@PathVariable String[] ids) {
// int rows = qcGoalService.deleteQcGoalByIds(ids); int rows = qcGoalService.deleteQcGoalByIds(ids);
// if (rows > 0 ) { if (rows > 0 ) {
// return success("操作成功"); return success("操作成功");
// }else { }else {
// return error("操作失败，请检查要删除的项目是否含有子项目"); return error("操作失败，请检查要删除的项目是否含有子项目");
// } }
// } }
} }

187
op-modules/op-quality/src/main/java/com/op/quality/controller/QcGoalDistributeController.java
Unescape Escape View File

@ -3,7 +3,6 @@ package com.op.quality.controller;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.op.quality.domain.QcGoal;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@ -17,7 +16,7 @@ import com.op.common.log.annotation.Log;
import com.op.common.log.enums.BusinessType; import com.op.common.log.enums.BusinessType;
import com.op.common.security.annotation.RequiresPermissions; import com.op.common.security.annotation.RequiresPermissions;
import com.op.quality.domain.QcGoalDistribute; import com.op.quality.domain.QcGoalDistribute;
//import com.op.quality.service.IQcGoalDistributeService; import com.op.quality.service.IQcGoalDistributeService;
import com.op.common.core.web.controller.BaseController; import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult; import com.op.common.core.web.domain.AjaxResult;
import com.op.common.core.utils.poi.ExcelUtil; import com.op.common.core.utils.poi.ExcelUtil;
@ -32,87 +31,107 @@ import com.op.common.core.web.page.TableDataInfo;
@RestController @RestController
@RequestMapping("/qcGoalDistribute") @RequestMapping("/qcGoalDistribute")
public class QcGoalDistributeController extends BaseController { public class QcGoalDistributeController extends BaseController {
// @Autowired @Autowired
// private IQcGoalDistributeService qcGoalDistributeService; private IQcGoalDistributeService qcGoalDistributeService;
//
///** /**
// * 查询质量目标分配列表 * 查询质量目标分配列表
// */ */
//@RequiresPermissions("quality:qcGoalDistribute:list") @RequiresPermissions("quality:qcGoalDistribute:list")
//@GetMapping("/list") @GetMapping("/list")
// public TableDataInfo list(QcGoalDistribute qcGoalDistribute) { public TableDataInfo list(QcGoalDistribute qcGoalDistribute) {
// startPage(); startPage();
// List<QcGoalDistribute> list = qcGoalDistributeService.selectQcGoalDistributeList(qcGoalDistribute); List<QcGoalDistribute> list = qcGoalDistributeService.selectQcGoalDistributeList(qcGoalDistribute);
// return getDataTable(list); return getDataTable(list);
// } }
//
// /** /**
// * 导出质量目标分配列表 * 导出质量目标分配列表
// */ */
// @RequiresPermissions("quality:qcGoalDistribute:export") @RequiresPermissions("quality:qcGoalDistribute:export")
// @Log(title = "质量目标分配", businessType = BusinessType.EXPORT) @Log(title = "质量目标分配", businessType = BusinessType.EXPORT)
// @PostMapping("/export") @PostMapping("/export")
// public void export(HttpServletResponse response, QcGoalDistribute qcGoalDistribute) { public void export(HttpServletResponse response, QcGoalDistribute qcGoalDistribute) {
// List<QcGoalDistribute> list = qcGoalDistributeService.selectQcGoalDistributeList(qcGoalDistribute); List<QcGoalDistribute> list = qcGoalDistributeService.selectQcGoalDistributeList(qcGoalDistribute);
// ExcelUtil<QcGoalDistribute> util = new ExcelUtil<QcGoalDistribute>(QcGoalDistribute. class); ExcelUtil<QcGoalDistribute> util = new ExcelUtil<QcGoalDistribute>(QcGoalDistribute. class);
// util.exportExcel(response, list, "质量目标分配数据"); util.exportExcel(response, list, "质量目标分配数据");
// } }
//
// /** /**
// * 获取质量目标分配详细信息 * 获取质量目标分配详细信息
// */ */
// @RequiresPermissions("quality:qcGoalDistribute:query") @RequiresPermissions("quality:qcGoalDistribute:query")
// @GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
// public AjaxResult getInfo(@PathVariable("id") String id) { public AjaxResult getInfo(@PathVariable("id") String id) {
// return success(qcGoalDistributeService.selectQcGoalDistributeById(id)); return success(qcGoalDistributeService.selectQcGoalDistributeById(id));
// } }
//
// /** /**
// * 新增质量目标分配 * 新增质量目标分配
// */ */
// @Log(title = "质量目标分配", businessType = BusinessType.INSERT) @Log(title = "质量目标分配", businessType = BusinessType.INSERT)
// @PostMapping @PostMapping
// public AjaxResult add(@RequestBody QcGoalDistribute qcGoalDistribute) { public AjaxResult add(@RequestBody QcGoalDistribute qcGoalDistribute) {
// return toAjax(qcGoalDistributeService.insertQcGoalDistribute(qcGoalDistribute)); return toAjax(qcGoalDistributeService.insertQcGoalDistribute(qcGoalDistribute));
// } }
//
// /** /**
// * 修改质量目标分配 * 修改质量目标分配
// */ */
// @RequiresPermissions("quality:qcGoalDistribute:edit") @RequiresPermissions("quality:qcGoalDistribute:edit")
// @Log(title = "质量目标分配", businessType = BusinessType.UPDATE) @Log(title = "质量目标分配", businessType = BusinessType.UPDATE)
// @PutMapping @PutMapping
// public AjaxResult edit(@RequestBody QcGoalDistribute qcGoalDistribute) { public AjaxResult edit(@RequestBody QcGoalDistribute qcGoalDistribute) {
// return toAjax(qcGoalDistributeService.updateQcGoalDistribute(qcGoalDistribute)); return toAjax(qcGoalDistributeService.updateQcGoalDistribute(qcGoalDistribute));
// } }
//
// /** /**
// * 删除质量目标分配 * 删除质量目标分配
// */ */
// @RequiresPermissions("quality:qcGoalDistribute:remove") @RequiresPermissions("quality:qcGoalDistribute:remove")
// @Log(title = "质量目标分配", businessType = BusinessType.DELETE) @Log(title = "质量目标分配", businessType = BusinessType.DELETE)
// @DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
// public AjaxResult remove(@PathVariable String[] ids) { public AjaxResult remove(@PathVariable String[] ids) {
// return toAjax(qcGoalDistributeService.deleteQcGoalDistributeByIds(ids)); return toAjax(qcGoalDistributeService.deleteQcGoalDistributeByIds(ids));
// } }
// /** /**
// * 获取未分配供应商数据 * 获取未分配供应商数据
// */ */
// @GetMapping(value = "/getLeftList") @GetMapping(value = "/getLeftList")
// public TableDataInfo getLeftList(QcGoalDistribute qcGoalDistribute) { public TableDataInfo getLeftList(QcGoalDistribute qcGoalDistribute) {
// startPage(); startPage();
// List<QcGoalDistribute> list = qcGoalDistributeService.getLeftList(qcGoalDistribute); List<QcGoalDistribute> list = qcGoalDistributeService.getLeftList(qcGoalDistribute);
// return getDataTable(list); return getDataTable(list);
// } }
//
// /** /**
// * 获取已分配供应商数据 * 获取已分配供应商数据
// */ */
// @GetMapping(value = "/getRightList") @GetMapping(value = "/getRightList")
// public TableDataInfo getRightList(QcGoalDistribute qcGoalDistribute) { public TableDataInfo getRightList(QcGoalDistribute qcGoalDistribute) {
// startPage(); startPage();
// List<QcGoalDistribute> list = qcGoalDistributeService.getRightList(qcGoalDistribute); List<QcGoalDistribute> list = qcGoalDistributeService.getRightList(qcGoalDistribute);
// return getDataTable(list); return getDataTable(list);
// } }
/**
* 获取未分配供应商数据
*/
@GetMapping(value = "/getProductLeftList")
public TableDataInfo getProductLeftList(QcGoalDistribute qcGoalDistribute) {
startPage();
List<QcGoalDistribute> list = qcGoalDistributeService.getProductLeftList(qcGoalDistribute);
return getDataTable(list);
}
/**
* 获取已分配供应商数据
*/
@GetMapping(value = "/getProductRightList")
public TableDataInfo getProductRightList(QcGoalDistribute qcGoalDistribute) {
startPage();
List<QcGoalDistribute> list = qcGoalDistributeService.getProductRightList(qcGoalDistribute);
return getDataTable(list);
}
} }

7
op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java
Unescape Escape View File

@ -252,6 +252,13 @@ public class QuaController extends BaseController {
return qcCheckTaskIncomeService.getDefectListPDA(qcDefectType); return qcCheckTaskIncomeService.getDefectListPDA(qcDefectType);
} }
/**检测地点编码名称**/
@PostMapping("/getCheckLocList")
public List<QcDefectType> getCheckLocList(@RequestBody QcDefectType qcDefectType) {
DynamicDataSourceContextHolder.push(qcDefectType.getFactoryCode());
return qcCheckTaskIncomeService.getCheckLocList(qcDefectType);
}
/**获取生产工单列表**/ /**获取生产工单列表**/
@GetMapping("/getWorkOrder") @GetMapping("/getWorkOrder")
public TableDataInfo getWorkOrder(QcCheckTaskIncome qcCheckTaskIncome) { public TableDataInfo getWorkOrder(QcCheckTaskIncome qcCheckTaskIncome) {

2
op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java
Unescape Escape View File

@ -108,4 +108,6 @@ public interface QcCheckTaskIncomeMapper {
List<QcCheckTaskIncome> getIncomeBatchList(); List<QcCheckTaskIncome> getIncomeBatchList();
int updateIncomeBatchList(@Param("list") List<String> batchRecordIds, @Param("time") Date taskTime); int updateIncomeBatchList(@Param("list") List<String> batchRecordIds, @Param("time") Date taskTime);
List<QcDefectType> getCheckLocList(QcDefectType qcDefectType);
} }

3
op-modules/op-quality/src/main/java/com/op/quality/mapper/QcGoalDistributeMapper.java
Unescape Escape View File

@ -66,5 +66,8 @@ public interface QcGoalDistributeMapper {
public List<QcGoalDistribute> getGoalDistributeUndo(QcGoalDistribute qcGoalDistribute); public List<QcGoalDistribute> getGoalDistributeUndo(QcGoalDistribute qcGoalDistribute);
public List<QcGoalDistribute> getGoalDistributeDo(QcGoalDistribute qcGoalDistribute); public List<QcGoalDistribute> getGoalDistributeDo(QcGoalDistribute qcGoalDistribute);
public List<QcGoalDistribute> getProductUndo(QcGoalDistribute qcGoalDistribute);
public List<QcGoalDistribute> getProductDo(QcGoalDistribute qcGoalDistribute);
} }

2
op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java
Unescape Escape View File

@ -96,4 +96,6 @@ public interface IQcCheckTaskIncomeService {
List<QcCheckTaskIncome> getIncomeBatchList(String poolName); List<QcCheckTaskIncome> getIncomeBatchList(String poolName);
int updateIncomeBatchList(List<String> batchRecordIds , Date taskTime); int updateIncomeBatchList(List<String> batchRecordIds , Date taskTime);
List<QcDefectType> getCheckLocList(QcDefectType qcDefectType);
} }

67
op-modules/op-quality/src/main/java/com/op/quality/service/IQcGoalDistributeService.java
Unescape Escape View File

@ -0,0 +1,67 @@
package com.op.quality.service;
import java.util.List;
import com.op.quality.domain.QcGoalDistribute;
/**
* 质量目标分配Service接口
*
* @author Open Platform
* @date 2024-03-07
*/
public interface IQcGoalDistributeService {
/**
* 查询质量目标分配
*
* @param id 质量目标分配主键
* @return 质量目标分配
*/
public QcGoalDistribute selectQcGoalDistributeById(String id);
/**
* 查询质量目标分配列表
*
* @param qcGoalDistribute 质量目标分配
* @return 质量目标分配集合
*/
public List<QcGoalDistribute> selectQcGoalDistributeList(QcGoalDistribute qcGoalDistribute);
/**
* 新增质量目标分配
*
* @param qcGoalDistribute 质量目标分配
* @return 结果
*/
public int insertQcGoalDistribute(QcGoalDistribute qcGoalDistribute);
/**
* 修改质量目标分配
*
* @param qcGoalDistribute 质量目标分配
* @return 结果
*/
public int updateQcGoalDistribute(QcGoalDistribute qcGoalDistribute);
/**
* 批量删除质量目标分配
*
* @param ids 需要删除的质量目标分配主键集合
* @return 结果
*/
public int deleteQcGoalDistributeByIds(String[] ids);
/**
* 删除质量目标分配信息
*
* @param id 质量目标分配主键
* @return 结果
*/
public int deleteQcGoalDistributeById(String id);
public List<QcGoalDistribute> getLeftList(QcGoalDistribute qcGoalDistribute);
public List<QcGoalDistribute> getRightList(QcGoalDistribute qcGoalDistribute);
public List<QcGoalDistribute> getProductLeftList(QcGoalDistribute qcGoalDistribute);
public List<QcGoalDistribute> getProductRightList(QcGoalDistribute qcGoalDistribute);
}

85
op-modules/op-quality/src/main/java/com/op/quality/service/IQcGoalService.java
Unescape Escape View File

@ -0,0 +1,85 @@
package com.op.quality.service;
import java.util.List;
import com.op.quality.domain.QcGoal;
import com.op.quality.domain.vo.TreeSelect;
/**
* 质量目标Service接口
*
* @author Open Platform
* @date 2024-03-04
*/
public interface IQcGoalService {
/**
* 查询质量目标
*
* @param id 质量目标主键
* @return 质量目标
*/
public QcGoal selectQcGoalById(String id);
/**
* 查询质量目标列表
*
* @param qcGoal 质量目标
* @return 质量目标集合
*/
public List<QcGoal> selectQcGoalList(QcGoal qcGoal);
/**
* 查询质量目标二级数据
* @param goal
* @return
*/
public List<QcGoal> selectChildrenByParent(QcGoal goal);
/**
* 构建质量目标下拉树
* @param qcGoals
* @return
*/
public List<TreeSelect> buildQcGoalTreeSelect(List<QcGoal> qcGoals);
/**
* 新增质量目标
*
* @param qcGoal 质量目标
* @return 结果
*/
public int insertQcGoal(QcGoal qcGoal);
public List<QcGoal> generate(String id);
/**
* 修改质量目标
*
* @param qcGoal 质量目标
* @return 结果
*/
public int updateQcGoal(QcGoal qcGoal);
/**
* 批量删除质量目标
*
* @param ids 需要删除的质量目标主键集合
* @return 结果
*/
public int deleteQcGoalByIds(String[] ids);
/**
* 删除质量目标信息
*
* @param id 质量目标主键
* @return 结果
*/
public int deleteQcGoalById(String id);
/**
* 构建质量目标树结构
* @param qcGoals
* @return
*/
public List<QcGoal> buildGoalTree(List<QcGoal> qcGoals);
}

7
op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
Unescape Escape View File

@ -721,4 +721,11 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
public int updateIncomeBatchList(List<String> batchRecordIds , Date taskTime){ public int updateIncomeBatchList(List<String> batchRecordIds , Date taskTime){
return qcCheckTaskIncomeMapper.updateIncomeBatchList(batchRecordIds ,taskTime); return qcCheckTaskIncomeMapper.updateIncomeBatchList(batchRecordIds ,taskTime);
} }
@Override
public List<QcDefectType> getCheckLocList(QcDefectType qcDefectType) {
return qcCheckTaskIncomeMapper.getCheckLocList(qcDefectType);
}
} }

327
op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcGoalDistributeServiceImpl.java
Unescape Escape View File

@ -1,153 +1,174 @@
//package com.op.quality.service.impl; package com.op.quality.service.impl;
//
//import java.util.Date; import java.util.Date;
//import java.util.List; import java.util.List;
//
//import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DS;
//import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.DateUtils;
//import com.op.common.core.utils.StringUtils; import com.op.common.core.utils.StringUtils;
//import com.op.common.core.utils.uuid.IdUtils; import com.op.common.core.utils.uuid.IdUtils;
//import com.op.common.security.utils.SecurityUtils; import com.op.common.security.utils.SecurityUtils;
//import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
//import com.op.quality.mapper.QcGoalDistributeMapper; import com.op.quality.mapper.QcGoalDistributeMapper;
//import com.op.quality.domain.QcGoalDistribute; import com.op.quality.domain.QcGoalDistribute;
//import com.op.quality.service.IQcGoalDistributeService; import com.op.quality.service.IQcGoalDistributeService;
//import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
//import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.ServletRequestAttributes;
//
//import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
//
///** /**
// * 质量目标分配Service业务层处理 * 质量目标分配Service业务层处理
// * *
// * @author Open Platform * @author Open Platform
// * @date 2024-03-07 * @date 2024-03-07
// */ */
//@Service @Service
//public class QcGoalDistributeServiceImpl implements IQcGoalDistributeService { public class QcGoalDistributeServiceImpl implements IQcGoalDistributeService {
// @Autowired @Autowired
// private QcGoalDistributeMapper qcGoalDistributeMapper; private QcGoalDistributeMapper qcGoalDistributeMapper;
//
// /** /**
// * 查询质量目标分配 * 查询质量目标分配
// * *
// * @param id 质量目标分配主键 * @param id 质量目标分配主键
// * @return 质量目标分配 * @return 质量目标分配
// */ */
// @Override @Override
// @DS("#header.poolName") @DS("#header.poolName")
// public QcGoalDistribute selectQcGoalDistributeById(String id) { public QcGoalDistribute selectQcGoalDistributeById(String id) {
// return qcGoalDistributeMapper.selectQcGoalDistributeById(id); return qcGoalDistributeMapper.selectQcGoalDistributeById(id);
// } }
//
// /** /**
// * 查询质量目标分配列表 * 查询质量目标分配列表
// * *
// * @param qcGoalDistribute 质量目标分配 * @param qcGoalDistribute 质量目标分配
// * @return 质量目标分配 * @return 质量目标分配
// */ */
// @Override @Override
// @DS("#header.poolName") @DS("#header.poolName")
// public List<QcGoalDistribute> selectQcGoalDistributeList(QcGoalDistribute qcGoalDistribute) { public List<QcGoalDistribute> selectQcGoalDistributeList(QcGoalDistribute qcGoalDistribute) {
// return qcGoalDistributeMapper.selectQcGoalDistributeList(qcGoalDistribute); return qcGoalDistributeMapper.selectQcGoalDistributeList(qcGoalDistribute);
// } }
//
// /** /**
// * 新增质量目标分配 * 新增质量目标分配
// * *
// * @param qcGoalDistribute 质量目标分配 * @param qcGoalDistribute 质量目标分配
// * @return 结果 * @return 结果
// */ */
// @Override @Override
// @DS("#header.poolName") @DS("#header.poolName")
// public int insertQcGoalDistribute(QcGoalDistribute qcGoalDistribute) { public int insertQcGoalDistribute(QcGoalDistribute qcGoalDistribute) {
//
// if (StringUtils.isNotEmpty(qcGoalDistribute.getBelongGoalId())) { if (StringUtils.isNotEmpty(qcGoalDistribute.getBelongGoalId())) {
// qcGoalDistributeMapper.deleteQcGoalDistributeByBelongId(qcGoalDistribute.getBelongGoalId()); qcGoalDistributeMapper.deleteQcGoalDistributeByBelongId(qcGoalDistribute.getBelongGoalId());
// } }
// int count = 0; int count = 0;
// if (qcGoalDistribute.getSelectedValues().size() > 0){ if (qcGoalDistribute.getSelectedValues().size() > 0){
// QcGoalDistribute dto = null; QcGoalDistribute dto = null;
// Date now = DateUtils.getNowDate(); Date now = DateUtils.getNowDate();
// HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
// String key = "#header.poolName"; String key = "#header.poolName";
// String factoryCode = request.getHeader(key.substring(8)).replace("ds_", ""); String factoryCode = request.getHeader(key.substring(8)).replace("ds_", "");
// for (String supplierCode : qcGoalDistribute.getSelectedValues()) { for (String supplierCode : qcGoalDistribute.getSelectedValues()) {
// dto = new QcGoalDistribute(); dto = new QcGoalDistribute();
// dto.setId(IdUtils.fastSimpleUUID()); dto.setId(IdUtils.fastSimpleUUID());
// dto.setCreateTime(now); dto.setCreateTime(now);
// dto.setCreateBy(SecurityUtils.getUsername()); dto.setCreateBy(SecurityUtils.getUsername());
// dto.setBelongGoalId(qcGoalDistribute.getBelongGoalId()); dto.setBelongGoalId(qcGoalDistribute.getBelongGoalId());
// dto.setSupplierCode(supplierCode); dto.setSupplierCode(supplierCode);
// dto.setFactoryCode(factoryCode); dto.setFactoryCode(factoryCode);
// count += qcGoalDistributeMapper.insertQcGoalDistribute(dto); count += qcGoalDistributeMapper.insertQcGoalDistribute(dto);
// } }
// }else { }else {
// count = 1; count = 1;
// } }
// return count; return count;
// } }
//
// /** /**
// * 修改质量目标分配 * 修改质量目标分配
// * *
// * @param qcGoalDistribute 质量目标分配 * @param qcGoalDistribute 质量目标分配
// * @return 结果 * @return 结果
// */ */
// @Override @Override
// @DS("#header.poolName") @DS("#header.poolName")
// public int updateQcGoalDistribute(QcGoalDistribute qcGoalDistribute) { public int updateQcGoalDistribute(QcGoalDistribute qcGoalDistribute) {
// qcGoalDistribute.setUpdateTime(DateUtils.getNowDate()); qcGoalDistribute.setUpdateTime(DateUtils.getNowDate());
// return qcGoalDistributeMapper.updateQcGoalDistribute(qcGoalDistribute); return qcGoalDistributeMapper.updateQcGoalDistribute(qcGoalDistribute);
// } }
//
// /** /**
// * 批量删除质量目标分配 * 批量删除质量目标分配
// * *
// * @param ids 需要删除的质量目标分配主键 * @param ids 需要删除的质量目标分配主键
// * @return 结果 * @return 结果
// */ */
// @Override @Override
// @DS("#header.poolName") @DS("#header.poolName")
// public int deleteQcGoalDistributeByIds(String[] ids) { public int deleteQcGoalDistributeByIds(String[] ids) {
// return qcGoalDistributeMapper.deleteQcGoalDistributeByIds(ids); return qcGoalDistributeMapper.deleteQcGoalDistributeByIds(ids);
// } }
//
// /** /**
// * 删除质量目标分配信息 * 删除质量目标分配信息
// * *
// * @param id 质量目标分配主键 * @param id 质量目标分配主键
// * @return 结果 * @return 结果
// */ */
// @Override @Override
// @DS("#header.poolName") @DS("#header.poolName")
// public int deleteQcGoalDistributeById(String id) { public int deleteQcGoalDistributeById(String id) {
// return qcGoalDistributeMapper.deleteQcGoalDistributeById(id); return qcGoalDistributeMapper.deleteQcGoalDistributeById(id);
// } }
//
// @Override @Override
// @DS("#header.poolName") @DS("#header.poolName")
// public List<QcGoalDistribute> getLeftList(QcGoalDistribute qcGoalDistribute) { public List<QcGoalDistribute> getLeftList(QcGoalDistribute qcGoalDistribute) {
// List<QcGoalDistribute> dto = qcGoalDistributeMapper.getGoalDistributeUndo(qcGoalDistribute); List<QcGoalDistribute> dto = qcGoalDistributeMapper.getGoalDistributeUndo(qcGoalDistribute);
// List<QcGoalDistribute> selected = qcGoalDistributeMapper.getGoalDistributeDo(qcGoalDistribute); List<QcGoalDistribute> selected = qcGoalDistributeMapper.getGoalDistributeDo(qcGoalDistribute);
// dto.addAll(selected); dto.addAll(selected);
// dto.forEach(item -> { dto.forEach(item -> {
// item.setKey(item.getSupplierCode()); item.setKey(item.getSupplierCode());
// }); });
// return dto; return dto;
// } }
//
// @Override @Override
// @DS("#header.poolName") @DS("#header.poolName")
// public List<QcGoalDistribute> getRightList(QcGoalDistribute qcGoalDistribute) { public List<QcGoalDistribute> getRightList(QcGoalDistribute qcGoalDistribute) {
// List<QcGoalDistribute> selected = qcGoalDistributeMapper.getGoalDistributeDo(qcGoalDistribute); List<QcGoalDistribute> selected = qcGoalDistributeMapper.getGoalDistributeDo(qcGoalDistribute);
// selected.forEach(item -> { selected.forEach(item -> {
// item.setKey(item.getSupplierCode()); item.setKey(item.getSupplierCode());
// }); });
// return selected; return selected;
// } }
// @Override
// @DS("#header.poolName")
// public List<QcGoalDistribute> getProductLeftList(QcGoalDistribute qcGoalDistribute) {
//} List<QcGoalDistribute> dto = qcGoalDistributeMapper.getProductUndo(qcGoalDistribute);
List<QcGoalDistribute> selected = qcGoalDistributeMapper.getProductDo(qcGoalDistribute);
dto.addAll(selected);
dto.forEach(item -> {
item.setKey(item.getSupplierCode());
});
return dto;
}
@Override
@DS("#header.poolName")
public List<QcGoalDistribute> getProductRightList(QcGoalDistribute qcGoalDistribute) {
List<QcGoalDistribute> selected = qcGoalDistributeMapper.getProductDo(qcGoalDistribute);
selected.forEach(item -> {
item.setKey(item.getSupplierCode());
});
return selected;
}
}

490
op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcGoalServiceImpl.java
Unescape Escape View File

@ -1,245 +1,245 @@
//package com.op.quality.service.impl; package com.op.quality.service.impl;
//
//import java.math.BigDecimal; import java.math.BigDecimal;
//import java.util.ArrayList; import java.util.ArrayList;
//import java.util.Date; import java.util.Date;
//import java.util.Iterator; import java.util.Iterator;
//import java.util.List; import java.util.List;
//import java.util.stream.Collectors; import java.util.stream.Collectors;
//
//import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DS;
//import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.DateUtils;
//import com.op.common.security.utils.SecurityUtils; import com.op.common.security.utils.SecurityUtils;
//import com.op.quality.domain.vo.TreeSelect; import com.op.quality.domain.vo.TreeSelect;
//import com.sun.xml.bind.v2.TODO; import com.sun.xml.bind.v2.TODO;
//import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
//import com.op.quality.mapper.QcGoalMapper; import com.op.quality.mapper.QcGoalMapper;
//import com.op.quality.domain.QcGoal; import com.op.quality.domain.QcGoal;
//import com.op.quality.service.IQcGoalService; import com.op.quality.service.IQcGoalService;
//import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
//import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
//import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.ServletRequestAttributes;
//
//import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
//
///** /**
// * 质量目标Service业务层处理 * 质量目标Service业务层处理
// * *
// * @author Open Platform * @author Open Platform
// * @date 2024-03-04 * @date 2024-03-04
// */ */
//@Service @Service
//public class QcGoalServiceImpl implements IQcGoalService { public class QcGoalServiceImpl implements IQcGoalService {
// @Autowired @Autowired
// private QcGoalMapper qcGoalMapper; private QcGoalMapper qcGoalMapper;
//
// /** /**
// * 查询质量目标 * 查询质量目标
// * *
// * @param id 质量目标主键 * @param id 质量目标主键
// * @return 质量目标 * @return 质量目标
// */ */
// @Override @Override
// @DS("#header.poolName") @DS("#header.poolName")
// public QcGoal selectQcGoalById(String id) { public QcGoal selectQcGoalById(String id) {
// return qcGoalMapper.selectQcGoalById(id); return qcGoalMapper.selectQcGoalById(id);
// } }
//
// /** /**
// * 查询质量目标列表 * 查询质量目标列表
// * *
// * @param qcGoal 质量目标 * @param qcGoal 质量目标
// * @return 质量目标 * @return 质量目标
// */ */
// @Override @Override
// @DS("#header.poolName") @DS("#header.poolName")
// public List<QcGoal> selectQcGoalList(QcGoal qcGoal) { public List<QcGoal> selectQcGoalList(QcGoal qcGoal) {
// List<QcGoal> qcGoals = qcGoalMapper.selectQcGoalList(qcGoal); List<QcGoal> qcGoals = qcGoalMapper.selectQcGoalList(qcGoal);
// for (QcGoal item : qcGoals) { for (QcGoal item : qcGoals) {
// item.setHasChildren(true); item.setHasChildren(true);
// } }
// return qcGoals; return qcGoals;
// } }
//
// @Override @Override
// @DS("#header.poolName") @DS("#header.poolName")
// public List<QcGoal> selectChildrenByParent(QcGoal goal) { public List<QcGoal> selectChildrenByParent(QcGoal goal) {
// return qcGoalMapper.selectChildrenByParent(goal); return qcGoalMapper.selectChildrenByParent(goal);
// } }
//
// @Override @Override
// @DS("#header.poolName") @DS("#header.poolName")
// public List<TreeSelect> buildQcGoalTreeSelect(List<QcGoal> qcGoals) { public List<TreeSelect> buildQcGoalTreeSelect(List<QcGoal> qcGoals) {
// List<QcGoal> qcGoalTrees = buildGoalTree(qcGoals); List<QcGoal> qcGoalTrees = buildGoalTree(qcGoals);
// return qcGoalTrees.stream().map(TreeSelect::new).collect(Collectors.toList()); return qcGoalTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
// } }
//
// /** /**
// * 新增质量目标 * 新增质量目标
// * *
// * @param qcGoal 质量目标 * @param qcGoal 质量目标
// * @return 结果 * @return 结果
// */ */
// @Override @Override
// @DS("#header.poolName") @DS("#header.poolName")
// public int insertQcGoal(QcGoal qcGoal) { public int insertQcGoal(QcGoal qcGoal) {
// qcGoal.setCreateTime(DateUtils.getNowDate()); qcGoal.setCreateTime(DateUtils.getNowDate());
// qcGoal.setCreateBy(SecurityUtils.getUsername()); qcGoal.setCreateBy(SecurityUtils.getUsername());
//
// qcGoal.setId(getSerialNumber(qcGoal)); qcGoal.setId(getSerialNumber(qcGoal));
// qcGoal.setFactoryCode(getFactoryCode()); qcGoal.setFactoryCode(getFactoryCode());
// qcGoal.setParentGoal("0"); qcGoal.setParentGoal("0");
//
// return qcGoalMapper.insertQcGoal(qcGoal); return qcGoalMapper.insertQcGoal(qcGoal);
// } }
//
// @Override @Override
// @DS("#header.poolName") @DS("#header.poolName")
// public List<QcGoal> generate(String id) { public List<QcGoal> generate(String id) {
// QcGoal goal = qcGoalMapper.selectQcGoalById(id); QcGoal goal = qcGoalMapper.selectQcGoalById(id);
// List<QcGoal> genResult = new ArrayList<>(); List<QcGoal> genResult = new ArrayList<>();
//
// // 提前分配大小，有助于减少不必要的计算和内存分配，从而提高代码的性能。 // 提前分配大小，有助于减少不必要的计算和内存分配，从而提高代码的性能。
// String goalYm = goal.getGoalYm(); String goalYm = goal.getGoalYm();
// BigDecimal nookQualityRate = goal.getNookQualityRate(); BigDecimal nookQualityRate = goal.getNookQualityRate();
// BigDecimal nookRate = goal.getNookRate(); BigDecimal nookRate = goal.getNookRate();
// String checkType = goal.getCheckType(); String checkType = goal.getCheckType();
// String typeCode = goal.getTypeCode(); String typeCode = goal.getTypeCode();
// String factoryCode = getFactoryCode(); String factoryCode = getFactoryCode();
// String username = SecurityUtils.getUsername(); String username = SecurityUtils.getUsername();
// Date nowDate = DateUtils.getNowDate(); Date nowDate = DateUtils.getNowDate();
// String parentGoal = goal.getId(); String parentGoal = goal.getId();
//
//
// int liushuiNum = qcGoalMapper.getTodayMaxNum(goal); int liushuiNum = qcGoalMapper.getTodayMaxNum(goal);
// String dateNumber = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate()); String dateNumber = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate());
//
// int month = 12; int month = 12;
// for (int i = 1; i <= month; i++) { for (int i = 1; i <= month; i++) {
// QcGoal monthGoal = new QcGoal(); QcGoal monthGoal = new QcGoal();
//
// String liushuiStr = String.format("%04d", liushuiNum+i-1); String liushuiStr = String.format("%04d", liushuiNum+i-1);
// monthGoal.setId(dateNumber+liushuiStr); monthGoal.setId(dateNumber+liushuiStr);
// String mon = String.format("%02d",i); String mon = String.format("%02d",i);
// monthGoal.setGoalYm(goalYm+"-"+mon); monthGoal.setGoalYm(goalYm+"-"+mon);
// monthGoal.setGoalType("mm"); monthGoal.setGoalType("mm");
// monthGoal.setNookQualityRate(nookQualityRate); monthGoal.setNookQualityRate(nookQualityRate);
// monthGoal.setNookRate(nookRate); monthGoal.setNookRate(nookRate);
// monthGoal.setCheckType(checkType); monthGoal.setCheckType(checkType);
// monthGoal.setTypeCode(typeCode); monthGoal.setTypeCode(typeCode);
// monthGoal.setScope(goal.getScope()); monthGoal.setScope(goal.getScope());
// monthGoal.setCreateTime(nowDate); monthGoal.setCreateTime(nowDate);
// monthGoal.setCreateBy(username); monthGoal.setCreateBy(username);
// monthGoal.setFactoryCode(factoryCode); monthGoal.setFactoryCode(factoryCode);
// monthGoal.setParentGoal(parentGoal); monthGoal.setParentGoal(parentGoal);
// genResult.add(monthGoal); genResult.add(monthGoal);
// } }
// // 批量插入 // 批量插入
// int flag = qcGoalMapper.insertQcGoalList(genResult); int flag = qcGoalMapper.insertQcGoalList(genResult);
// if (flag > 0) { if (flag > 0) {
// return genResult; return genResult;
// }else { }else {
// return goal.getChildren(); return goal.getChildren();
// } }
//
// } }
//
// /** /**
// * 修改质量目标 * 修改质量目标
// * *
// * @param qcGoal 质量目标 * @param qcGoal 质量目标
// * @return 结果 * @return 结果
// */ */
// @Override @Override
// @DS("#header.poolName") @DS("#header.poolName")
// public int updateQcGoal(QcGoal qcGoal) { public int updateQcGoal(QcGoal qcGoal) {
// qcGoal.setUpdateTime(DateUtils.getNowDate()); qcGoal.setUpdateTime(DateUtils.getNowDate());
// qcGoal.setUpdateBy(SecurityUtils.getUsername()); qcGoal.setUpdateBy(SecurityUtils.getUsername());
// return qcGoalMapper.updateQcGoal(qcGoal); return qcGoalMapper.updateQcGoal(qcGoal);
// } }
//
// /** /**
// * 批量删除质量目标 * 批量删除质量目标
// * *
// * @param ids 需要删除的质量目标主键 * @param ids 需要删除的质量目标主键
// * @return 结果 * @return 结果
// */ */
// @Override @Override
// @DS("#header.poolName") @DS("#header.poolName")
// public int deleteQcGoalByIds(String[] ids) { public int deleteQcGoalByIds(String[] ids) {
// boolean flag = false; boolean flag = false;
// for (String id : ids) { for (String id : ids) {
// QcGoal goal = new QcGoal(); QcGoal goal = new QcGoal();
// goal.setParentGoal(id); goal.setParentGoal(id);
// List<QcGoal> hasChildren = qcGoalMapper.selectChildrenByParent(goal); List<QcGoal> hasChildren = qcGoalMapper.selectChildrenByParent(goal);
// if (hasChildren.size() > 0) { if (hasChildren.size() > 0) {
// flag = true; flag = true;
// break; break;
// } }
// } }
// if (flag) { if (flag) {
// return 0; return 0;
// }else { }else {
// return qcGoalMapper.deleteQcGoalByIds(ids); return qcGoalMapper.deleteQcGoalByIds(ids);
// } }
// } }
//
// /** /**
// * 删除质量目标信息 * 删除质量目标信息
// * *
// * @param id 质量目标主键 * @param id 质量目标主键
// * @return 结果 * @return 结果
// */ */
// @Override @Override
// @DS("#header.poolName") @DS("#header.poolName")
// public int deleteQcGoalById(String id) { public int deleteQcGoalById(String id) {
// return qcGoalMapper.deleteQcGoalById(id); return qcGoalMapper.deleteQcGoalById(id);
// } }
//
// @Override @Override
// public List<QcGoal> buildGoalTree(List<QcGoal> qcGoals) { public List<QcGoal> buildGoalTree(List<QcGoal> qcGoals) {
// List<QcGoal> returnList = new ArrayList<>(); List<QcGoal> returnList = new ArrayList<>();
// List<String> tempList = qcGoals.stream().map(QcGoal::getId).collect(Collectors.toList()); List<String> tempList = qcGoals.stream().map(QcGoal::getId).collect(Collectors.toList());
// for (Iterator<QcGoal> iterator = qcGoals.iterator(); iterator.hasNext(); ) { for (Iterator<QcGoal> iterator = qcGoals.iterator(); iterator.hasNext(); ) {
// QcGoal qcGoal = (QcGoal) iterator.next(); QcGoal qcGoal = (QcGoal) iterator.next();
// //如果是顶级节点，遍历父节点的所有子节点 //如果是顶级节点，遍历父节点的所有子节点
// if (!tempList.contains(qcGoal.getParentGoal())) { if (!tempList.contains(qcGoal.getParentGoal())) {
// List<QcGoal> childList = getChildList(qcGoals,qcGoal); List<QcGoal> childList = getChildList(qcGoals,qcGoal);
// qcGoal.setChildren(childList); qcGoal.setChildren(childList);
// returnList.add(qcGoal); returnList.add(qcGoal);
// } }
// } }
// if (returnList.isEmpty()) { if (returnList.isEmpty()) {
// returnList = qcGoals; returnList = qcGoals;
// } }
// return returnList; return returnList;
// } }
//
// private List<QcGoal> getChildList(List<QcGoal> list, QcGoal t) { private List<QcGoal> getChildList(List<QcGoal> list, QcGoal t) {
// List<QcGoal> tlist = new ArrayList<>(); List<QcGoal> tlist = new ArrayList<>();
// Iterator<QcGoal> it = list.iterator(); Iterator<QcGoal> it = list.iterator();
// while (it.hasNext()) { while (it.hasNext()) {
// QcGoal goal = (QcGoal) it.next(); QcGoal goal = (QcGoal) it.next();
// if (goal.getParentGoal().equals(t.getId())){ if (goal.getParentGoal().equals(t.getId())){
// tlist.add(goal); tlist.add(goal);
// } }
// } }
// return tlist; return tlist;
// } }
//
// @DS("#header.poolName") @DS("#header.poolName")
// private String getSerialNumber(QcGoal qcGoal) { private String getSerialNumber(QcGoal qcGoal) {
// int liushuiNum = qcGoalMapper.getTodayMaxNum(qcGoal); int liushuiNum = qcGoalMapper.getTodayMaxNum(qcGoal);
// String liushuiStr = String.format("%04d", liushuiNum); String liushuiStr = String.format("%04d", liushuiNum);
// String dateNumber = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate()); String dateNumber = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate());
// return dateNumber + liushuiStr; return dateNumber + liushuiStr;
// } }
// @DS("#header.poolName") @DS("#header.poolName")
// private String getFactoryCode() { private String getFactoryCode() {
// HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
// String key = "#header.poolName"; String key = "#header.poolName";
// return request.getHeader(key.substring(8)).replace("ds_", ""); return request.getHeader(key.substring(8)).replace("ds_", "");
// } }
//
//} }

1
op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml
Unescape Escape View File

@ -160,6 +160,7 @@
left join qc_check_project qcp on qcp.id = qctp.project_id left join qc_check_project qcp on qcp.id = qctp.project_id
left join qc_project_type qpt on qpt.project_type_code = qcp.project_type left join qc_project_type qpt on qpt.project_type_code = qcp.project_type
where td.belong_to = #{recordId} where td.belong_to = #{recordId}
order by qctp.sort
</select> </select>
<select id="getTopInfo" resultType="com.op.quality.domain.QcCheckTaskProduce"> <select id="getTopInfo" resultType="com.op.quality.domain.QcCheckTaskProduce">
select t.*,be.equipment_name lineName from( select t.*,be.equipment_name lineName from(

10
op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
Unescape Escape View File

@ -151,6 +151,7 @@
from qc_check_task_detail td from qc_check_task_detail td
left join qc_check_type_project qctp on td.type_project_id = qctp.id left join qc_check_type_project qctp on td.type_project_id = qctp.id
where td.belong_to = #{belongTo} and td.del_flag='0' and qctp.del_flag = '0' and td.rule_name is not null where td.belong_to = #{belongTo} and td.del_flag='0' and qctp.del_flag = '0' and td.rule_name is not null
order by qctp.sort
</select> </select>
<select id="getQcUnitList" resultType="com.op.system.api.domain.SysDictData"> <select id="getQcUnitList" resultType="com.op.system.api.domain.SysDictData">
select dict_label dictLabel, select dict_label dictLabel,
@ -440,6 +441,13 @@
and check_status = '0' and check_status = '0'
</select> </select>
<select id="getCheckLocList" resultType="com.op.quality.domain.QcDefectType">
select equipment_code defectCode,
equipment_name defectSubclass
from base_equipment
where equipment_type_code='equ_type_bzx' and status = '1'
</select>
<!--批量更新原始表--> <!--批量更新原始表-->
<update id="updateIncomeBatchList"> <update id="updateIncomeBatchList">
<foreach collection="list" item="item" separator=";"> <foreach collection="list" item="item" separator=";">
@ -451,4 +459,6 @@
record_id = #{item} record_id = #{item}
</foreach> </foreach>
</update> </update>
</mapper> </mapper>

3
op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml
Unescape Escape View File

@ -110,7 +110,8 @@
<if test="checkNo != null and checkNo != ''">and qct.check_no = #{checkNo}</if> <if test="checkNo != null and checkNo != ''">and qct.check_no = #{checkNo}</if>
<if test="incomeBatchNo != null and incomeBatchNo != ''">and qct.income_batch_no = #{incomeBatchNo}</if> <if test="incomeBatchNo != null and incomeBatchNo != ''">and qct.income_batch_no = #{incomeBatchNo}</if>
<if test="orderNo != null and orderNo != ''">and qct.order_no = #{orderNo}</if> <if test="orderNo != null and orderNo != ''">and qct.order_no = #{orderNo}</if>
<if test="materialCode != null and materialCode != ''">and qct.material_code = #{materialCode}</if> <if test="materialCode != null and materialCode != ''">and qct.material_code like concat('%',
#{materialCode}, '%')</if>
<if test="materialName != null and materialName != ''">and qct.material_name like concat('%', <if test="materialName != null and materialName != ''">and qct.material_name like concat('%',
#{materialName}, '%') #{materialName}, '%')
</if> </if>

32
op-modules/op-quality/src/main/resources/mapper/quality/QcGoalDistributeMapper.xml
Unescape Escape View File

@ -214,5 +214,37 @@
</if> </if>
</select> </select>
<select id="getProductUndo" parameterType="QcGoalDistribute" resultType="QcGoalDistribute">
SELECT
bp.product_code supplierCode,
concat ( bp.product_desc_zh, '(', bp.product_code, ')' ) label
FROM
base_product bp
WHERE
bp.active_flag = '1'
AND bp.del_flag = '0'
AND bp.product_code NOT IN (
SELECT gd.supplier_code
FROM qc_goal_distribute gd
WHERE gd.belong_goal_id =#{ belongGoalId }
)
<if test="supplierName != null and supplierName != ''">and bs.zh_desc like concat('%', #{supplierName},'%')
</if>
</select>
<select id="getProductDo" parameterType="QcGoalDistribute" resultType="QcGoalDistribute">
SELECT DISTINCT
gd.supplier_code supplierCode,
concat ( bp.product_desc_zh, '(', bp.product_code, ')' ) label
FROM
qc_goal_distribute gd
LEFT JOIN base_product bp ON gd.supplier_code = bp.product_code
WHERE
gd.belong_goal_id =#{ belongGoalId}
<if test="supplierName != null and supplierName != ''">and bp.product_desc_zh like concat('%', #{supplierName},
'%')
</if>
</select>
</mapper> </mapper>

31
op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml
Unescape Escape View File

@ -203,22 +203,21 @@
and CONVERT(varchar(7),feedback_time, 120) = SUBSTRING(#{ymd},0,8) and CONVERT(varchar(7),feedback_time, 120) = SUBSTRING(#{ymd},0,8)
</select> </select>
<select id="getDayNoOkHz" resultType="com.op.quality.domain.QcInterface"> <select id="getDayNoOkHz" resultType="com.op.quality.domain.QcInterface">
SELECT SELECT
concat(t.machine_code,t.ymd) ymd, concat(t.workorder_name,t.ymd) ymd,
sum(t.noOk_quality) noOkQuality, sum(t.noOk_quality) noOkQuality,
t.machine_code machineCode t.workorder_name machineCode
from( from(
select CONVERT(varchar(10),qct.income_time, 120) ymd, select CONVERT(varchar(10),qct.income_time, 120) ymd,
qct.noOk_quality, qct.noOk_quality,
mrw.machine_code pow.workorder_name
from qc_check_task qct from qc_check_task qct
left join pro_order_workorder pow on qct.order_no = pow.workorder_code_sap left join pro_order_workorder pow on qct.order_no = pow.workorder_code
left join mes_report_work mrw on pow.workorder_code = mrw.workorder_code where qct.type_code = #{typeCode}
where qct.type_code = #{typeCode} and qct.del_flag='0'
and qct.del_flag='0' and CONVERT(varchar(7),qct.income_time, 120) = SUBSTRING(#{ymd},0,8)
and CONVERT(varchar(7),qct.income_time, 120) = SUBSTRING(#{ymd},0,8) ) t
) t group by t.workorder_name,t.ymd
group by t.machine_code,t.ymd
</select> </select>
<select id="getMothNoOkNum" resultType="com.op.quality.domain.QcInterface"> <select id="getMothNoOkNum" resultType="com.op.quality.domain.QcInterface">
select select

1
op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml
Unescape Escape View File

@ -269,6 +269,7 @@
<if test='checkType=="checkTypeSCXJ" or checkType=="checkTypeSC"'> <if test='checkType=="checkTypeSCXJ" or checkType=="checkTypeSC"'>
and pow.del_flag = '0' and pow.del_flag = '0'
</if> </if>
<if test="checkLoc != null and checkLoc != ''">and qct.check_loc = #{checkLoc}</if>
<if test="checkType != null and checkType != ''">and qct.check_type = #{checkType}</if> <if test="checkType != null and checkType != ''">and qct.check_type = #{checkType}</if>
<if test="checkManCode != null and checkManCode != ''">and qctu.check_man_code = #{checkManCode}</if> <if test="checkManCode != null and checkManCode != ''">and qctu.check_man_code = #{checkManCode}</if>
<if test="checkStatus != null and checkStatus != ''">and qct.check_status in (${checkStatus})</if> <if test="checkStatus != null and checkStatus != ''">and qct.check_status in (${checkStatus})</if>

87
op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java
Unescape Escape View File

@ -235,6 +235,71 @@ public class WmsToWCSmissionController {
public AjaxResult WmsProductPutByWorkOrderConfirm(@RequestBody WmsProductPut wmsProductPut) { public AjaxResult WmsProductPutByWorkOrderConfirm(@RequestBody WmsProductPut wmsProductPut) {
return AjaxResult.success(wmsProductPutService.WmsProductPutByWorkOrderConfirm(wmsProductPut)); return AjaxResult.success(wmsProductPutService.WmsProductPutByWorkOrderConfirm(wmsProductPut));
} }
/**
* 成品
* 托盘关联箱码
*/
@PostMapping("/addSnCorrelationBarcode")
public AjaxResult addSnCorrelationBarcode(@RequestBody WmsProductPutTrayCode wmsProductPutTrayCode) {
return AjaxResult.success(wmsProductPutService.addSnCorrelationBarcode(wmsProductPutTrayCode));
}
/**
* 成品
* 解除托盘关联箱码
*/
@PostMapping("/deletSnCorrelationBarcode")
public AjaxResult deletSnCorrelationBarcode(@RequestBody WmsProductPutTrayCode wmsProductPutTrayCode) {
return AjaxResult.success(wmsProductPutService.deletSnCorrelationBarcode(wmsProductPutTrayCode));
}
/**
* 查询托盘和箱码的关系信息
*
*/
@PostMapping("/selectSnCorrelationBarcode")
public AjaxResult selectSnCorrelationBarcode(@RequestBody WmsProductPutTrayCode wmsProductPutTrayCode) {
return AjaxResult.success(wmsProductPutService.selectSnCorrelationBarcode(wmsProductPutTrayCode));
}
/**
* 成品销售出库--提单查询接口
*
*/
@PostMapping("/selectFinishedProductSales")
public AjaxResult selectFinishedProductSales(@RequestBody WmsSellOutEmbryo wmsSellOutEmbryo) {
return AjaxResult.success(wmsProductPutService.selectFinishedProductSales(wmsSellOutEmbryo));
}
/**
* 成品销售出库--确认接口
*
*/
@PostMapping("/confirmFinishedProductSales")
public AjaxResult confirmFinishedProductSales(@RequestBody WmsSellOutEmbryo wmsSellOutEmbryo) {
return AjaxResult.success(wmsProductPutService.confirmFinishedProductSales(wmsSellOutEmbryo));
}
/**
* 成品销售出库----整托扫码
*
*/
@PostMapping("/ScanCodeWholePallet")
public AjaxResult ScanCodeWholePallet(@RequestBody WmsProductPutTrayCode wmsProductPutTrayCode) {
return AjaxResult.success(wmsProductPutService.ScanCodeWholePallet(wmsProductPutTrayCode));
}
/**
* 成品销售出库----单箱扫码
*
*/
@PostMapping("/ScanCodeSingleBox")
public AjaxResult ScanCodeSingleBox(@RequestBody WmsProductPutTrayCode wmsProductPutTrayCode) {
return AjaxResult.success(wmsProductPutService.ScanCodeSingleBox(wmsProductPutTrayCode));
}
/** /**
* 手持白胚入库查询 * 手持白胚入库查询
*/ */
@ -301,4 +366,26 @@ public class WmsToWCSmissionController {
String result= iOdsWhiteEmbryoService.WhiteWarehouseDump(wmsOdsEmStorageNewsSn); String result= iOdsWhiteEmbryoService.WhiteWarehouseDump(wmsOdsEmStorageNewsSn);
return success(result); return success(result);
} }
@PostMapping("/queryMaterialInfor")
public AjaxResult queryMaterialInfor(@RequestBody WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn) {
// OdsProcureOutOrder orderList = odsProcureOrderService.PurchaseOrderOutboundPda(odsProcureOrder);
WmsOdsEmStorageNews wmsOdsEmStorageNews= iOdsWhiteEmbryoService.queryMaterialInfor(wmsOdsEmStorageNewsSn);
return success(wmsOdsEmStorageNews);
}
/**
* 用于白坯退货确认-
*
* @param wmsOdsEmStorageNewsSn
* @return
*/
@PostMapping("/WhiteBilletReturnConfir")
public AjaxResult WhiteBilletReturnConfir(@RequestBody WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn) {
// OdsProcureOutOrder orderList = odsProcureOrderService.PurchaseOrderOutboundPda(odsProcureOrder);
String result= iOdsWhiteEmbryoService.WhiteBilletReturnConfir(wmsOdsEmStorageNewsSn);
return success(result);
}
} }

26
op-modules/op-wms/src/main/java/com/op/wms/domain/BaseEquipment.java
Unescape Escape View File

@ -346,6 +346,16 @@ public class BaseEquipment extends BaseEntity {
@Excel(name = "计量单位") @Excel(name = "计量单位")
private String unitMeasurement; private String unitMeasurement;
//新增SAP字段
/**
* SAP线体编码
*/
private String sapCode;
/**
* SAP线体名称
*/
private String sapName;
private String imageFileList; private String imageFileList;
private String barCodeFileList; private String barCodeFileList;
@ -1134,6 +1144,22 @@ public class BaseEquipment extends BaseEntity {
return unitMeasurement; return unitMeasurement;
} }
//SAP线体编码
public void setSapCode(String sapCode) {
this.sapCode = sapCode;
}
public String getSapCode() {
return sapCode;
}
//SAP线体名称
public void setSapName(String sapName) {
this.sapName = sapName;
}
public String getSapName() {
return sapName;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

24
op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutTrayCode.java
Unescape Escape View File

@ -32,6 +32,20 @@ public class WmsProductPutTrayCode extends BaseEntity {
@Excel(name = "箱码") @Excel(name = "箱码")
private String barcode; private String barcode;
/**
* 库位
*/
@Excel(name = "库位")
private String wlCode;
public String getWlCode() {
return wlCode;
}
public void setWlCode(String wlCode) {
this.wlCode = wlCode;
}
/** /**
* 数量 * 数量
*/ */
@ -43,6 +57,16 @@ public class WmsProductPutTrayCode extends BaseEntity {
*/ */
@Excel(name = "关联状态") @Excel(name = "关联状态")
private String relatStatus; private String relatStatus;
@Excel(name = "工厂")
private String siteCode;
public String getSiteCode() {
return siteCode;
}
public void setSiteCode(String siteCode) {
this.siteCode = siteCode;
}
/** /**
* 预留字段1 * 预留字段1

2
op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsEmStorageNewsMapper.java
Unescape Escape View File

@ -63,4 +63,6 @@ public interface WmsOdsEmStorageNewsMapper {
void updateAdd(WmsOdsEmStorageNews wmsOdsEmStorageNews); void updateAdd(WmsOdsEmStorageNews wmsOdsEmStorageNews);
WmsOdsEmStorageNews selectWmsOdsEmStorageNewsByWlCode(WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn); WmsOdsEmStorageNews selectWmsOdsEmStorageNewsByWlCode(WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn);
List<WmsOdsEmStorageNews> selectWmsOdsEmStorageNewsByMaterialCode(WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn);
} }

10
op-modules/op-wms/src/main/java/com/op/wms/service/IOdsWhiteEmbryoService.java
Unescape Escape View File

@ -4,6 +4,7 @@ import java.util.List;
import com.op.wms.domain.OdsProcureOutOrder; import com.op.wms.domain.OdsProcureOutOrder;
import com.op.wms.domain.OdsWhiteEmbryo; import com.op.wms.domain.OdsWhiteEmbryo;
import com.op.wms.domain.WmsOdsEmStorageNews;
import com.op.wms.domain.WmsOdsEmStorageNewsSn; import com.op.wms.domain.WmsOdsEmStorageNewsSn;
/** /**
@ -68,4 +69,13 @@ public interface IOdsWhiteEmbryoService {
String WhiteEmbryoOutbound(OdsWhiteEmbryo odsWhiteEmbryo); String WhiteEmbryoOutbound(OdsWhiteEmbryo odsWhiteEmbryo);
String WhiteWarehouseDump(WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn); String WhiteWarehouseDump(WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn);
/**
*
* @param wmsOdsEmStorageNewsSn
* @return
*/
String WhiteBilletReturnConfir(WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn);
WmsOdsEmStorageNews queryMaterialInfor(WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn);
} }

24
op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java
Unescape Escape View File

@ -4,9 +4,7 @@ import java.text.ParseException;
import java.util.List; import java.util.List;
import com.op.system.api.domain.wms.wmsReportWork; import com.op.system.api.domain.wms.wmsReportWork;
import com.op.wms.domain.ProOrderWorkorder; import com.op.wms.domain.*;
import com.op.wms.domain.WmsOdsWhiteEmbryoIn;
import com.op.wms.domain.WmsProductPut;
/** /**
* 成品生产入库Service接口 * 成品生产入库Service接口
@ -82,4 +80,24 @@ public interface IWmsProductPutService {
ProOrderWorkorder selectWmsOdsWhiteEmbryoInhAnd(WmsOdsWhiteEmbryoIn wmsOdsWhiteEmbryoIns); ProOrderWorkorder selectWmsOdsWhiteEmbryoInhAnd(WmsOdsWhiteEmbryoIn wmsOdsWhiteEmbryoIns);
String addtWmsOdsWhiteEmbryoInhAnd(WmsOdsWhiteEmbryoIn wmsOdsWhiteEmbryoIn); String addtWmsOdsWhiteEmbryoInhAnd(WmsOdsWhiteEmbryoIn wmsOdsWhiteEmbryoIn);
List<WmsProductPutTrayCode> selectSnCorrelationBarcode(WmsProductPutTrayCode wmsProductPutTrayCode);
String addSnCorrelationBarcode(WmsProductPutTrayCode wmsProductPutTrayCode);
String deletSnCorrelationBarcode(WmsProductPutTrayCode wmsProductPutTrayCode);
List<WmsSellOutEmbryo> selectFinishedProductSales(WmsSellOutEmbryo wmsSellOutEmbryo);
String confirmFinishedProductSales(WmsSellOutEmbryo wmsSellOutEmbryo);
/**
* 成品销售出库----整托扫码
*
*/
List<WmsProductPutTrayCode> ScanCodeWholePallet(WmsProductPutTrayCode wmsProductPutTrayCode);
/**
* 成品销售出库----单箱扫码
*
*/
WmsProductPutTrayCode ScanCodeSingleBox(WmsProductPutTrayCode wmsProductPutTrayCode);
} }

51
op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsWhiteEmbryoServiceImpl.java
Unescape Escape View File

@ -265,4 +265,55 @@ public class OdsWhiteEmbryoServiceImpl implements IOdsWhiteEmbryoService {
} }
return result; return result;
} }
@Override
public String WhiteBilletReturnConfir(WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn) {
DynamicDataSourceContextHolder.push("ds_" + wmsOdsEmStorageNewsSn.getFactoryCode());
//退货的--在生产线上退下来的--托盘号，库位，物料号，物料描述，退货数量
String result="成功";
WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn1=new WmsOdsEmStorageNewsSn();
wmsOdsEmStorageNewsSn1.setAmount(wmsOdsEmStorageNewsSn.getAmount());
wmsOdsEmStorageNewsSn1.setWlCode(wmsOdsEmStorageNewsSn.getWlCode());
wmsOdsEmStorageNewsSn1.setMaterialCode(wmsOdsEmStorageNewsSn.getMaterialCode());
wmsOdsEmStorageNewsSn1.setMaterialDesc(wmsOdsEmStorageNewsSn.getMaterialDesc());
wmsOdsEmStorageNewsSn1.setSn(wmsOdsEmStorageNewsSn.getSn());
wmsOdsEmStorageNewsSn1.setCreateBy(wmsOdsEmStorageNewsSn.getCreateBy());
wmsOdsEmStorageNewsSn1.setGmtCreate(new Date());
wmsOdsEmStorageNewsSn1.setActiveFlag("1");
wmsOdsEmStorageNewsSn1.setFactoryCode(wmsOdsEmStorageNewsSn.getFactoryCode());
wmsOdsEmStorageNewsSnMapper.insertWmsOdsEmStorageNewsSn(wmsOdsEmStorageNewsSn1);
WmsOdsEmStorageNews wmsOdsEmStorageNews1=new WmsOdsEmStorageNews();
wmsOdsEmStorageNews1.setWlCode(wmsOdsEmStorageNewsSn.gettOwlCode());
wmsOdsEmStorageNews1.setMaterialCode(wmsOdsEmStorageNewsSn.getMaterialCode());
wmsOdsEmStorageNews1.setMaterialDesc(wmsOdsEmStorageNewsSn.getMaterialDesc());
wmsOdsEmStorageNews1.setUserDefined1(wmsOdsEmStorageNewsSn.getUserDefined1());
wmsOdsEmStorageNews1.setFactoryCode(wmsOdsEmStorageNewsSn.getFactoryCode());
wmsOdsEmStorageNews1.setActiveFlag("1");
List<WmsOdsEmStorageNews> wmsOdsEmStorageNewsList= wmsOdsEmStorageNewsMapper.selectWmsOdsEmStorageNewsList(wmsOdsEmStorageNews1);
if (wmsOdsEmStorageNewsList.size()>0){
WmsOdsEmStorageNews wmsOdsEmStorageNews2= wmsOdsEmStorageNewsList.get(0);
BigDecimal newAmount= wmsOdsEmStorageNews2.getAmount();
wmsOdsEmStorageNews2.setAmount(newAmount.add(wmsOdsEmStorageNewsSn.getAmount()));
wmsOdsEmStorageNewsMapper.updateWmsOdsEmStorageNews(wmsOdsEmStorageNews2);
}else {
wmsOdsEmStorageNews1.setStorageId(IdUtils.fastSimpleUUID());
wmsOdsEmStorageNews1.setCreateBy(wmsOdsEmStorageNewsSn.getCreateBy());
wmsOdsEmStorageNews1.setGmtCreate(new Date());
wmsOdsEmStorageNewsMapper.insertWmsOdsEmStorageNews(wmsOdsEmStorageNews1);
}
return result;
}
@Override
public WmsOdsEmStorageNews queryMaterialInfor(WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn) {
DynamicDataSourceContextHolder.push("ds_" + wmsOdsEmStorageNewsSn.getFactoryCode());
WmsOdsEmStorageNews wmsOdsEmStorageNew=new WmsOdsEmStorageNews();
List<WmsOdsEmStorageNews> wmsOdsEmStorageNews= wmsOdsEmStorageNewsMapper.selectWmsOdsEmStorageNewsByMaterialCode(wmsOdsEmStorageNewsSn);
if (wmsOdsEmStorageNews.size()>0){
wmsOdsEmStorageNew=wmsOdsEmStorageNews.get(0);
}
return wmsOdsEmStorageNew;
}
} }

84
op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
Unescape Escape View File

@ -56,6 +56,9 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
private WmsOdsEmStorageNewsSnMapper wmsOdsEmStorageNewsSnMapper; private WmsOdsEmStorageNewsSnMapper wmsOdsEmStorageNewsSnMapper;
@Autowired @Autowired
private WmsOdsEmStorageNewsMapper wmsOdsEmStorageNewsMapper; private WmsOdsEmStorageNewsMapper wmsOdsEmStorageNewsMapper;
@Autowired
private WmsProductPutTrayCodeMapper wmsProductPutTrayCodeMapper;
/** /**
* 查询成品生产入库 * 查询成品生产入库
* *
@ -639,4 +642,85 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
return result; return result;
} }
@Override
public List<WmsProductPutTrayCode> selectSnCorrelationBarcode(WmsProductPutTrayCode wmsProductPutTrayCode) {
DynamicDataSourceContextHolder.push("ds_" + wmsProductPutTrayCode.getSiteCode());
wmsProductPutTrayCode.setRelatStatus("1");
List<WmsProductPutTrayCode> wmsProductPutTrayCodeList= wmsProductPutTrayCodeMapper.selectWmsProductPutTrayCodeList(wmsProductPutTrayCode);
return wmsProductPutTrayCodeList;
}
@Override
public String addSnCorrelationBarcode(WmsProductPutTrayCode wmsProductPutTrayCode) {
String result="关联成功";
DynamicDataSourceContextHolder.push("ds_" + wmsProductPutTrayCode.getSiteCode());
wmsProductPutTrayCode.setRelatStatus("1");
wmsProductPutTrayCode.setStorageId(IdUtils.fastSimpleUUID());
wmsProductPutTrayCode.setNumber(1);
wmsProductPutTrayCodeMapper.insertWmsProductPutTrayCode(wmsProductPutTrayCode);
return result;
}
@Override
public String deletSnCorrelationBarcode(WmsProductPutTrayCode wmsProductPutTrayCode) {
String result="解除成功";
DynamicDataSourceContextHolder.push("ds_" + wmsProductPutTrayCode.getSiteCode());
wmsProductPutTrayCodeMapper.deleteWmsProductPutTrayCodeByStorageId(wmsProductPutTrayCode.getStorageId());
return result;
}
@Override
public List<WmsSellOutEmbryo> selectFinishedProductSales(WmsSellOutEmbryo wmsSellOutEmbryo) {
return null;
}
@Override
public String confirmFinishedProductSales(WmsSellOutEmbryo wmsSellOutEmbryo) {
return null;
}
@Override
public List<WmsProductPutTrayCode> ScanCodeWholePallet(WmsProductPutTrayCode wmsProductPutTrayCode) {
DynamicDataSourceContextHolder.push("ds_" + wmsProductPutTrayCode.getSiteCode());
wmsProductPutTrayCode.setRelatStatus("1");
List<WmsProductPutTrayCode> wmsProductPutTrayCodeList= wmsProductPutTrayCodeMapper.selectWmsProductPutTrayCodeList(wmsProductPutTrayCode);//sn
WmsFpStorageNewsSn wmsFpStorageNewsSn=new WmsFpStorageNewsSn();
wmsFpStorageNewsSn.setSn(wmsProductPutTrayCode.getSn());
wmsFpStorageNewsSn.setActiveFlag("1");
List<WmsFpStorageNewsSn> wmsFpStorageNewsSns= wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn);
if (wmsFpStorageNewsSns.size()>0){
WmsFpStorageNewsSn wmsFpStorageNewsSn1= wmsFpStorageNewsSns.get(0);
for (WmsProductPutTrayCode wmsProductPutTrayCode1:
wmsProductPutTrayCodeList) {
wmsProductPutTrayCode1.setWlCode(wmsFpStorageNewsSn1.getWlCode());
}
}
return wmsProductPutTrayCodeList;
}
@Override
public WmsProductPutTrayCode ScanCodeSingleBox(WmsProductPutTrayCode wmsProductPutTrayCode) {
DynamicDataSourceContextHolder.push("ds_" + wmsProductPutTrayCode.getSiteCode());
wmsProductPutTrayCode.setRelatStatus("1");
//barcode
List<WmsProductPutTrayCode> wmsProductPutTrayCodeList= wmsProductPutTrayCodeMapper.selectWmsProductPutTrayCodeList(wmsProductPutTrayCode);
//对应的箱码
if (wmsProductPutTrayCodeList.size()>0){
WmsProductPutTrayCode wmsProductPutTrayCode1= wmsProductPutTrayCodeList.get(0);
wmsProductPutTrayCode.setSn(wmsProductPutTrayCode1.getSn());//托盘
WmsFpStorageNewsSn wmsFpStorageNewsSn=new WmsFpStorageNewsSn();
wmsFpStorageNewsSn.setSn(wmsProductPutTrayCode.getSn());
wmsFpStorageNewsSn.setActiveFlag("1");
List<WmsFpStorageNewsSn> wmsFpStorageNewsSns= wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn);
//库位
if(wmsFpStorageNewsSns.size()>0){
WmsFpStorageNewsSn wmsFpStorageNewsSn1= wmsFpStorageNewsSns.get(0);
wmsProductPutTrayCode.setWlCode( wmsFpStorageNewsSn1.getWlCode());//库位
return wmsProductPutTrayCode;
}
}
return null;
}
} }

15
op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml
Unescape Escape View File

@ -54,7 +54,8 @@
<result property="equipmentNumber" column="equipment_number"/> <result property="equipmentNumber" column="equipment_number"/>
<result property="inventoryNumber" column="inventory_number"/> <result property="inventoryNumber" column="inventory_number"/>
<result property="unitMeasurement" column="unit_measurement"/> <result property="unitMeasurement" column="unit_measurement"/>
<result property="sapCode" column="sap_code"/>
<result property="sapName" column="sap_name"/>
</resultMap> </resultMap>
<resultMap type="WmsSparePartsLedger" id="WmsSparePartsLedgerResult"> <resultMap type="WmsSparePartsLedger" id="WmsSparePartsLedgerResult">
@ -175,7 +176,9 @@
asset_description, asset_description,
equipment_number, equipment_number,
inventory_number, inventory_number,
unit_measurement unit_measurement,
sap_code,
sap_name
from base_equipment from base_equipment
</sql> </sql>
@ -251,6 +254,8 @@
<if test="equipmentNumber != null and equipmentNumber != ''">and equipment_number = #{equipmentNumber}</if> <if test="equipmentNumber != null and equipmentNumber != ''">and equipment_number = #{equipmentNumber}</if>
<if test="inventoryNumber != null and inventoryNumber != ''">and inventory_number = #{inventoryNumber}</if> <if test="inventoryNumber != null and inventoryNumber != ''">and inventory_number = #{inventoryNumber}</if>
<if test="unitMeasurement != null and unitMeasurement != ''">and unit_measurement = #{unitMeasurement}</if> <if test="unitMeasurement != null and unitMeasurement != ''">and unit_measurement = #{unitMeasurement}</if>
<if test="sapCode != null and sapCode != ''">and sap_code = #{sapCode}</if>
<if test="sapName != null and sapName != ''">and sap_name = #{sapName}</if>
and del_flag ='0' and del_flag ='0'
</where> </where>
</select> </select>
@ -318,6 +323,8 @@
<if test="equipmentNumber != null">equipment_number,</if> <if test="equipmentNumber != null">equipment_number,</if>
<if test="inventoryNumber != null">inventory_number,</if> <if test="inventoryNumber != null">inventory_number,</if>
<if test="unitMeasurement != null">unit_measurement,</if> <if test="unitMeasurement != null">unit_measurement,</if>
<if test="sapCode != null">sap_code,</if>
<if test="sapName != null">sap_name,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="equipmentCode != null and equipmentCode != ''">#{equipmentCode},</if> <if test="equipmentCode != null and equipmentCode != ''">#{equipmentCode},</if>
@ -368,6 +375,8 @@
<if test="equipmentNumber != null and equipmentNumber != ''">#{equipmentNumber},</if> <if test="equipmentNumber != null and equipmentNumber != ''">#{equipmentNumber},</if>
<if test="inventoryNumber != null and inventoryNumber != ''">#{inventoryNumber},</if> <if test="inventoryNumber != null and inventoryNumber != ''">#{inventoryNumber},</if>
<if test="unitMeasurement != null and unitMeasurement != ''">#{unitMeasurement},</if> <if test="unitMeasurement != null and unitMeasurement != ''">#{unitMeasurement},</if>
<if test="sapCode != null and sapCode != ''">#{sapCode},</if>
<if test="sapName != null and sapName != ''">#{sapName},</if>
</trim> </trim>
</insert> </insert>
@ -427,6 +436,8 @@
<if test="equipmentNumber != null and equipmentNumber != ''">equipment_number = #{equipmentNumber},</if> <if test="equipmentNumber != null and equipmentNumber != ''">equipment_number = #{equipmentNumber},</if>
<if test="inventoryNumber != null and inventoryNumber != ''">inventory_number = #{inventoryNumber},</if> <if test="inventoryNumber != null and inventoryNumber != ''">inventory_number = #{inventoryNumber},</if>
<if test="unitMeasurement != null and unitMeasurement != ''">unit_measurement = #{unitMeasurement},</if> <if test="unitMeasurement != null and unitMeasurement != ''">unit_measurement = #{unitMeasurement},</if>
<if test="sapCode != null and sapCode != ''">sap_code = #{sapCode},</if>
<if test="sapName != null and sapName != ''">sap_name = #{sapName},</if>
</trim> </trim>
where equipment_id = #{equipmentId} where equipment_id = #{equipmentId}
</update> </update>

49
op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsEmStorageNewsMapper.xml
Unescape Escape View File

@ -41,8 +41,43 @@
</resultMap> </resultMap>
<sql id="selectWmsOdsEmStorageNewsVo"> <sql id="selectWmsOdsEmStorageNewsVo">
select storage_id, wh_code, region_code, wa_code, storage_type, wl_code, material_code, material_desc, amount, storage_amount, occupy_amount, lpn, product_batch, receive_date, product_date, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, user_defined7, user_defined8, user_defined9, user_defined10, create_by, gmt_create, last_modified_by, gmt_modified, active_flag, factory_code, sap_factory_code, wl_name from wms_ods_em_storage_news SELECT
</sql> storage_id,
wh_code,
region_code,
wa_code,
storage_type,
wl_code,
material_code,
material_desc,
COALESCE(amount, 0) as amount,
storage_amount,
occupy_amount,
lpn,
product_batch,
receive_date,
product_date,
user_defined1,
user_defined2,
user_defined3,
user_defined4,
user_defined5,
user_defined6,
user_defined7,
user_defined8,
user_defined9,
user_defined10,
create_by,
gmt_create,
last_modified_by,
gmt_modified,
active_flag,
factory_code,
sap_factory_code,
wl_name
FROM
wms_ods_em_storage_news
</sql>
<select id="selectWmsOdsEmStorageNewsList" parameterType="WmsOdsEmStorageNews" <select id="selectWmsOdsEmStorageNewsList" parameterType="WmsOdsEmStorageNews"
resultMap="WmsOdsEmStorageNewsResult"> resultMap="WmsOdsEmStorageNewsResult">
@ -222,4 +257,14 @@
<include refid="selectWmsOdsEmStorageNewsVo"/> <include refid="selectWmsOdsEmStorageNewsVo"/>
WHERE wl_code=#{wlCode} AND material_code=#{materialCode} AND active_flag='1' WHERE wl_code=#{wlCode} AND material_code=#{materialCode} AND active_flag='1'
</select> </select>
<select id="selectWmsOdsEmStorageNewsByMaterialCode" resultMap="WmsOdsEmStorageNewsResult">
SELECT
DISTINCT
material_code,
material_desc,
user_defined1
FROM
wms_ods_em_storage_news
WHERE material_code=#{materialCode} AND active_flag='1'
</select>
</mapper> </mapper>

Write Preview
Loading…
Cancel
Save