kelvin/wms-dj-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Kelvin 2024-11-29 09:39:39 +08:00
commit 42ce332dbe
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ktg-mes/src/main/java/com/ktg/mes/md/controller/BaseKnifeController.java
View File

@ -906,8 +906,8 @@ public class BaseKnifeController extends BaseController {
wmsInPlanTemp.setCellCode(zdTask.getAttr3()); wmsInPlanTemp.setCellCode(zdTask.getAttr3());
wmsInPlanTemp.setPlanCode(zdTask.getAttr4() == null ? zdTask.getCode() : zdTask.getAttr4()); wmsInPlanTemp.setPlanCode(zdTask.getAttr4() == null ? zdTask.getCode() : zdTask.getAttr4());
wmsInPlanTemp.setRelBillCode("组装单据"); wmsInPlanTemp.setRelBillCode("组装单据");
wmsInPlanTemp.setPlanTypeId(13L); wmsInPlanTemp.setPlanTypeId(9L);
wmsInPlanTemp.setPlanTypeCode("ZDRK"); wmsInPlanTemp.setPlanTypeCode("ZDHK");
wmsInPlanTemp.setCreateBy(getUsername()); wmsInPlanTemp.setCreateBy(getUsername());
wmsInPlanTemp.setCreateTime(DateUtils.getNowDate()); wmsInPlanTemp.setCreateTime(DateUtils.getNowDate());
@ -955,6 +955,7 @@ public class BaseKnifeController extends BaseController {
wmsInTask.setBatch(batchNum); wmsInTask.setBatch(batchNum);
wmsInTask.setMaterialId(zdTask.getmProductId().toString()); wmsInTask.setMaterialId(zdTask.getmProductId().toString());
wmsInTask.setPlanTypeId("9"); wmsInTask.setPlanTypeId("9");
wmsInTask.setPlanTypeCode("ZDHK");
wmsInTask.setPlanInStatus("1"); wmsInTask.setPlanInStatus("1");
wmsInTaskService.insertWmsInTask(wmsInTask); wmsInTaskService.insertWmsInTask(wmsInTask);
@ -1021,6 +1022,7 @@ public class BaseKnifeController extends BaseController {
@Log(title = "工具台账", businessType = BusinessType.INSERT) @Log(title = "工具台账", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody BaseKnife baseKnife) { public AjaxResult add(@RequestBody BaseKnife baseKnife) {
baseKnife.setCreateBy(getUsername());
return toAjax(baseKnifeService.insertBaseKnife(baseKnife)); return toAjax(baseKnifeService.insertBaseKnife(baseKnife));
} }
@ -1031,6 +1033,7 @@ public class BaseKnifeController extends BaseController {
@Log(title = "工具台账", businessType = BusinessType.UPDATE) @Log(title = "工具台账", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody BaseKnife baseKnife) { public AjaxResult edit(@RequestBody BaseKnife baseKnife) {
baseKnife.setUpdateBy(getUsername());
return toAjax(baseKnifeService.updateBaseKnife(baseKnife)); return toAjax(baseKnifeService.updateBaseKnife(baseKnife));
} }

7
ktg-mes/src/main/java/com/ktg/mes/md/service/impl/BaseKnifeServiceImpl.java
View File

@ -25,8 +25,6 @@ import java.io.File;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import static org.apache.commons.lang3.SystemUtils.getUserName;
/** /**
* 工具台账Service业务层处理 * 工具台账Service业务层处理
* *
@ -128,7 +126,8 @@ public class BaseKnifeServiceImpl implements IBaseKnifeService {
if ("PRODUCT".equals(nowWmsOutPlanDetailEntity.getItemOrProduct())) { if ("PRODUCT".equals(nowWmsOutPlanDetailEntity.getItemOrProduct())) {
try { try {
// File xmlFile = new File(myConfig.getToolSettingXmlPath() + nowBaseKnife.getRfid() + ".xml"); // File xmlFile = new File(myConfig.getToolSettingXmlPath() + nowBaseKnife.getRfid() + ".xml");
File xmlFile = new File(myConfig.getToolSettingXmlPath() + "DDYDATA0" + (new Random().nextInt(5) + 1) + ".xml"); File xmlFile = new File("\\\\DBJGJG24\\ddy\\aaa.xml");
// File xmlFile = new File(myConfig.getToolSettingXmlPath() + "DDYDATA0" + (new Random().nextInt(5) + 1) + ".xml");
JAXBContext jaxbContext = JAXBContext.newInstance(Tools.class); JAXBContext jaxbContext = JAXBContext.newInstance(Tools.class);
Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
Tools paramXml = (Tools) unmarshaller.unmarshal(xmlFile); Tools paramXml = (Tools) unmarshaller.unmarshal(xmlFile);
@ -179,7 +178,6 @@ public class BaseKnifeServiceImpl implements IBaseKnifeService {
@Override @Override
public int insertBaseKnife(BaseKnife baseKnife) { public int insertBaseKnife(BaseKnife baseKnife) {
baseKnife.setCreateTime(DateUtils.getNowDate()); baseKnife.setCreateTime(DateUtils.getNowDate());
baseKnife.setCreateBy(getUserName());
int rows = baseKnifeMapper.insertBaseKnife(baseKnife); int rows = baseKnifeMapper.insertBaseKnife(baseKnife);
return rows; return rows;
} }
@ -194,7 +192,6 @@ public class BaseKnifeServiceImpl implements IBaseKnifeService {
@Override @Override
public int updateBaseKnife(BaseKnife baseKnife) { public int updateBaseKnife(BaseKnife baseKnife) {
baseKnife.setUpdateTime(DateUtils.getNowDate()); baseKnife.setUpdateTime(DateUtils.getNowDate());
baseKnife.setUpdateBy(getUserName());
return baseKnifeMapper.updateBaseKnife(baseKnife); return baseKnifeMapper.updateBaseKnife(baseKnife);
} }

4
ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmsInTaskController.java
View File

@ -155,7 +155,7 @@ public class WmsInTaskController extends BaseController {
* 执行入库任务 * 执行入库任务
*/ */
// @PreAuthorize("@ss.hasPermi('wm:wmsInTask:issueBatch')") // @PreAuthorize("@ss.hasPermi('wm:wmsInTask:issueBatch')")
@Log(title = "入库任务", businessType = BusinessType.UPDATE) // @Log(title = "入库任务", businessType = BusinessType.UPDATE)
@PostMapping("/open/issueBatch/{ids}") @PostMapping("/open/issueBatch/{ids}")
@ResponseBody @ResponseBody
@Transactional @Transactional
@ -341,7 +341,7 @@ public class WmsInTaskController extends BaseController {
outPlan.setWmsBusinessTypeId(16L); outPlan.setWmsBusinessTypeId(16L);
outPlan.setPlanState("1"); outPlan.setPlanState("1");
outPlan.setPlanType("ZDCK"); outPlan.setPlanType("ZDCK");
outPlan.setCreateBy(getUsername()); // outPlan.setCreateBy(getUsername());
outPlan.setCreateTime(DateUtils.getNowDate()); outPlan.setCreateTime(DateUtils.getNowDate());
wmsOutPlanMapper.insertWmsOutPlan(outPlan); wmsOutPlanMapper.insertWmsOutPlan(outPlan);

1
ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmsZdTaskServiceImpl.java
View File

@ -443,6 +443,7 @@ public class WmsZdTaskServiceImpl implements IWmsZdTaskService
wmsInTask.setBatch(batchNum); wmsInTask.setBatch(batchNum);
wmsInTask.setMaterialId(zdTask.getmProductId().toString()); wmsInTask.setMaterialId(zdTask.getmProductId().toString());
wmsInTask.setPlanTypeId("9"); wmsInTask.setPlanTypeId("9");
wmsInTask.setPlanTypeCode("ZDHK");
wmsInTask.setPlanInStatus("0"); wmsInTask.setPlanInStatus("0");
wmsInTask.setDetailInId(wmsInPlan.getWmsInPlanDetailsList().get(0).getDetailsId()); wmsInTask.setDetailInId(wmsInPlan.getWmsInPlanDetailsList().get(0).getDetailsId());
wmsInTask.setCreateBy(getUsername()); wmsInTask.setCreateBy(getUsername());