Browse Source

增加首页接口。

master
刘忱 2 years ago
parent
commit
9c81939efc
  1. 41
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java
  2. 7
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java
  3. 10
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java
  4. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainService.java
  5. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java
  6. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java

41
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java

@ -0,0 +1,41 @@
package com.win.module.wms.controller.index;
import com.win.framework.common.pojo.CommonResult;
import com.win.module.wms.service.purchase.PurchaseMainService;
import com.win.module.wms.service.purchasePlan.PurchasePlanMainService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
import static com.win.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 首页")
@RestController
@RequestMapping("/wms/index")
@Validated
public class IndexController {
@Resource
private PurchaseMainService purchaseMainService;
@Resource
private PurchasePlanMainService purchasePlanMainService;
@GetMapping("/index")
@Operation(summary = "开放订单数")
public CommonResult<Map<String, Object>> index() {
Map<String, Object> dataMap = new HashMap<>();
dataMap.put("openPurchaseNum", purchaseMainService.getPurchaseCount(true));
dataMap.put("allPurchaseNum", purchaseMainService.getPurchaseCount(false));
dataMap.put("openPurchasePlanNum", purchasePlanMainService.getPurchasePlanCount(true));
dataMap.put("allPurchasePlanNum", purchasePlanMainService.getPurchasePlanCount(false));
return success(dataMap);
}
}

7
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java

@ -162,4 +162,11 @@ public interface PurchaseMainService {
* @param returnedQty
*/
void updateOrderPurchaseReturnQty(String poNumber , String poLine, String itemCode, BigDecimal returnedQty);
/**
* 放订单数
* @param isOpen 是否开放true开放false全部
* @return
*/
long getPurchaseCount(boolean isOpen);
}

10
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java

@ -735,4 +735,14 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
}
}
@Override
public long getPurchaseCount(boolean isOpen) {
QueryWrapper<PurchaseMainDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("available", "TRUE");
if(isOpen) {
queryWrapper.ne("status", OrderStatusEnum.CLOSED.getCode());
}
return purchaseMainMapper.selectCount(queryWrapper);
}
}

6
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainService.java

@ -156,4 +156,10 @@ public interface PurchasePlanMainService {
*/
void updatePlanPurchaseShippedQty(String number, String poNumber,String poLine, String itemCode, BigDecimal shippedQty);
/**
* 计划数
* @param isOpen 是否开放true开放false全部
* @return
*/
long getPurchasePlanCount(boolean isOpen);
}

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java

@ -22,7 +22,6 @@ import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO;
import com.win.module.wms.dal.dataobject.purchase.PurchaseMainDO;
import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanDetailDO;
import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanMainDO;
import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO;
import com.win.module.wms.dal.dataobject.shift.ShiftDO;
import com.win.module.wms.dal.dataobject.supplier.SupplierDO;
import com.win.module.wms.dal.dataobject.supplieritem.SupplieritemDO;
@ -31,6 +30,7 @@ import com.win.module.wms.dal.mysql.purchase.PurchaseMainMapper;
import com.win.module.wms.dal.mysql.purchasePlan.PurchasePlanDetailMapper;
import com.win.module.wms.dal.mysql.purchasePlan.PurchasePlanMainMapper;
import com.win.module.wms.enums.DictTypeConstants;
import com.win.module.wms.enums.order.OrderStatusEnum;
import com.win.module.wms.enums.plan.PlanStatusEnum;
import com.win.module.wms.enums.plan.PurchasePlanStatusEnum;
import com.win.module.wms.enums.request.RequestStatusEnum;
@ -432,7 +432,7 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService {
purchasePlanMainDOQueryWrapper.eq("number", poNumber);
purchasePlanMainDOQueryWrapper.eq("status", PurchasePlanStatusEnum.ACCEPTED.getCode());
List<PurchasePlanMainDO> purchasePlanMainDOList = purchasePlanMainMapper.selectList(purchasePlanMainDOQueryWrapper);
if (purchasePlanMainDOList != null && purchasePlanMainDOList.size() > 0) {
if (purchasePlanMainDOList != null && !purchasePlanMainDOList.isEmpty()) {
for (PurchasePlanMainDO purchasePlanMainDO : purchasePlanMainDOList) {
int i = 0;
QueryWrapper<PurchasePlanDetailDO> purchasePlanDetailDOQueryWrapper = new QueryWrapper();
@ -441,7 +441,7 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService {
purchasePlanDetailDOQueryWrapper.eq("item_code", itemCode);
purchasePlanDetailDOQueryWrapper.eq("available", "TRUE");
List<PurchasePlanDetailDO> purchasePlanDetailDOList = purchasePlanDetailMapper.selectList(purchasePlanDetailDOQueryWrapper);
if (purchasePlanDetailDOList != null && purchasePlanDetailDOList.size() > 0) {
if (purchasePlanDetailDOList != null && !purchasePlanDetailDOList.isEmpty()) {
for (PurchasePlanDetailDO purchasePlanDetailDO : purchasePlanDetailDOList) {
purchasePlanDetailDO.setShippedQty(shippedQty);
if (purchasePlanDetailDO.getPlanQty().compareTo(purchasePlanDetailDO.getShippedQty()) == 0) {
@ -465,4 +465,14 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService {
}
}
@Override
public long getPurchasePlanCount(boolean isOpen) {
QueryWrapper<PurchasePlanMainDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("available", "TRUE");
if(isOpen) {
queryWrapper.ne("status", OrderStatusEnum.CLOSED.getCode());
}
return purchasePlanMainMapper.selectCount(queryWrapper);
}
}

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java

@ -355,7 +355,7 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
putawayJobMainDO.setAllowPartialComplete(jobsettingDO.getAllowPartialComplete());
putawayJobMainDO.setAllowModifyPackingNumber(jobsettingDO.getAllowModifyPackingNumber());
putawayJobMainDO.setAllowModifyBatch(jobsettingDO.getAllowModifyBach());
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReturnRequest");
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchasePutawayJob");
putawayJobMainDO.setBusinessType(businesstypeDO.getCode());
putawayJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
putawayJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());

Loading…
Cancel
Save