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 
# Conflicts:
#	ktg-mes/src/main/java/com/ktg/mes/md/controller/WmsOutPlanController.java
This commit is contained in:
汤锦科 2024-11-28 11:05:30 +08:00
commit e96e1e21a1
3 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ktg-mes/src/main/java/com/ktg/mes/md/controller/WmsOutPlanController.java
View File

@ -8,6 +8,7 @@ import com.ktg.common.core.domain.AjaxResult;
import com.ktg.common.core.page.TableDataInfo;
import com.ktg.common.enums.BusinessType;
import com.ktg.common.utils.poi.ExcelUtil;
import com.ktg.mes.md.domain.AP0AE;
import com.ktg.mes.md.domain.WmsOutPlan;
import com.ktg.mes.md.domain.WmsOutPlanDetailEntity;
import com.ktg.mes.md.service.IAP0AEService;
@ -32,9 +33,6 @@ public class WmsOutPlanController extends BaseController {
@Autowired
private IWmsOutPlanService wmsOutPlanService;
@Autowired
private IAP0AEService aP0AEService;
/**
* 查询出库计划管理列表
*/
@ -51,10 +49,6 @@ public class WmsOutPlanController extends BaseController {
@PreAuthorize("@ss.hasPermi('md:PLAN:list')")
@GetMapping("/list")
public TableDataInfo list(WmsOutPlan wmsOutPlan) {
// System.out.println("===================================================");
// System.out.println(JSON.toJSONString(this.aP0AEService.selectAllAP0AE()));
// System.out.println("===================================================");
startPage();
List<WmsOutPlan> list = wmsOutPlanService.selectWmsOutPlanList(wmsOutPlan);
return getDataTable(list);
@ -113,7 +107,14 @@ public class WmsOutPlanController extends BaseController {
return toAjax(wmsOutPlanService.runWmsOutPlan(wmsOutPlanIds));
}
@PreAuthorize("@ss.hasPermi('md:PLAN:edit')")
@PreAuthorize("@ss.hasPermi('md:PLAN:add')")
@Log(title = "出库计划管理", businessType = BusinessType.UPDATE)
@PutMapping("/synchronization-mini-box")
public AjaxResult synchronizationMiniBox() {
return AjaxResult.success(wmsOutPlanService.synchronizationMiniBox(getUsername()));
}
@PreAuthorize("@ss.hasPermi('md:PLAN:add')")
@Log(title = "出库计划管理", businessType = BusinessType.UPDATE)
@PutMapping("/auto-scrap-out")
public AjaxResult autoScrapOut() {

3
ktg-mes/src/main/java/com/ktg/mes/md/service/IWmsOutPlanService.java
View File

@ -1,5 +1,6 @@
package com.ktg.mes.md.service;
import com.ktg.mes.md.domain.AP0AE;
import com.ktg.mes.md.domain.WmsOutPlan;
import com.ktg.mes.md.domain.WmsOutPlanDetailEntity;
@ -65,6 +66,8 @@ public interface IWmsOutPlanService {
List<HashMap<String, Object>> selectWmsOutPlanDetailEntityList(WmsOutPlanDetailEntity wmsOutPlanDetailEntity);
int synchronizationMiniBox(String username);
int autoScrapOut(String username);
public String checkPlanCodeUnique(WmsOutPlan wmsOutPlan);

19
ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsOutPlanServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.ktg.mes.md.service.impl;
import com.alibaba.fastjson.JSON;
import com.ktg.common.constant.UserConstants;
import com.ktg.common.utils.DateUtils;
import com.ktg.common.utils.StringUtils;
@ -45,6 +46,9 @@ public class WmsOutPlanServiceImpl implements IWmsOutPlanService {
@Autowired
private WmStorageAreaMapper wmStorageAreaMapper;
@Autowired
private AP0AEMapper ap0AEMapper;
/**
* 查询出库计划管理
*
@ -262,6 +266,21 @@ public class WmsOutPlanServiceImpl implements IWmsOutPlanService {
return hashMapList;
}
@Override
public int synchronizationMiniBox(String username) {
List<AP0AE> ap0AEList = ap0AEMapper.selectOutNewData();
System.out.println("=========================================");
System.out.println(JSON.toJSONString(ap0AEList));
System.out.println("=========================================");
List<WmsOutPlan> wmsOutPlanList = wmsOutPlanMapper.selectWmsOutPlanList(new WmsOutPlan());
System.out.println("=========================================");
System.out.println(JSON.toJSONString(wmsOutPlanList));
System.out.println("=========================================");
return 0;
}
@Transactional
@Override
public int autoScrapOut(String username) {