zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into test

Browse Source
This commit is contained in:
qianshijiang
2025-10-31 16:34:33 +08:00
parent 2117db4f1d 662df70065
commit e6458fbb68
12 changed files with 154 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/ContractApi.java
View File

@@ -42,7 +42,7 @@ public interface ContractApi {
@PostMapping(PREFIX + "/push")
@Operation(summary = "国贸2.0系统推送合同")
CommonResult<Boolean> push(@Valid @RequestBody IntContract reqVO) throws Exception;
CommonResult<Boolean> push(@Valid @RequestBody IntContract reqVO);
@GetMapping(PREFIX + "/logistics/list/page")
@Operation(summary = "国贸2.0系统合同分页查询")

3
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/contract/DictEnum.java
View File

@@ -8,6 +8,9 @@ import lombok.Getter;
@Getter
public enum DictEnum {
/** 方式系统 */
BSE_SYS_REL_WY_EXTERNAL("系统外关联","EXTERNAL",null),
BSE_SYS_REL_WY_INTERNAL("内关联","INTERNAL",null),
/** 供应链业务大类 */
SPLY_BSN_TP_03BX("货物保险","03BX",null),
SPLY_BSN_TP_11CC("货物保管仓储","11CC",null),

254
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java
View File

File diff suppressed because it is too large Load Diff

7
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java
View File

@@ -26,7 +26,6 @@ import java.util.List;
import static com.zt.plat.framework.common.pojo.CommonResult.error;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
import static com.zt.plat.module.contractorder.enums.ErrorCodeConstants.CONTRACT_PUSH_FAIL;
import static com.zt.plat.module.contractorder.enums.ErrorCodeConstants.CONTRACT_SUBMIT_ERP_FAIL;
@Slf4j
@@ -197,11 +196,7 @@ public class ContractController implements BusinessControllerMarker {
@Operation(summary = "国贸2.0系统推送合同")
@PreAuthorize("@ss.hasPermission('base:contract:create')")
CommonResult<Boolean> push(@Valid @RequestBody IntContract reqVO) {
try {
return contractApi.push(reqVO);
} catch (Exception e) {
return error(CONTRACT_PUSH_FAIL, e.getMessage());
}
return contractApi.push(reqVO);
}
@PostMapping("/logistics/list/page")

24
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PurchaseOrderController.java
View File

@@ -124,8 +124,8 @@ public class PurchaseOrderController implements BusinessControllerMarker {
@PostMapping("/submit-order")
@Operation(summary = "提交订单审核")
@PreAuthorize("@ss.hasPermission('bse:purchase-order:update')")
public CommonResult<Boolean> submitOrder(@RequestParam("id") Long id) {
purchaseOrderService.submitOrder(id);
public CommonResult<Boolean> submitOrder(@RequestParam("id") String id) {
purchaseOrderService.submitOrder(Long.valueOf(id));
return success(true);
}
@@ -142,15 +142,22 @@ public class PurchaseOrderController implements BusinessControllerMarker {
@PostMapping("/submit-erp061")
@Operation(summary = "推送ERP订单", description = "061')")
@PreAuthorize("@ss.hasPermission('bse:purchase-order:update')")
public CommonResult<?> submitErp061(@RequestBody @Validated @NotEmpty(message = "采购订单id不能为空") List<Long> ids) {
return success(purchaseOrderService.submitErp061(ids));
public CommonResult<?> submitErp061(@RequestBody @Validated @NotEmpty(message = "采购订单id不能为空") List<String> idsStr) {
List<Long> ids = idsStr.stream().map(Long::valueOf).toList();
// TODO 推送ERP订单
// purchaseOrderService.submitErp061(ids);
//随机生成六位数
return success(R());
}
@PostMapping("/submit-erp062")
@Operation(summary = "推送ERP订单", description = "062当每次调更新接口后都需要调此接口")
@PreAuthorize("@ss.hasPermission('bse:purchase-order:update')")
public CommonResult<?> submitErp062(@RequestParam @Validated @NotNull(message = "采购订单id不能为空") Long id) {
return success(purchaseOrderService.submitErp062(id));
public CommonResult<?> submitErp062(@RequestParam @Validated @NotNull(message = "采购订单id不能为空") String id) {
//TODO 推送ERP订单
return success(R());
}
//通过订单号查询订单信息
@@ -205,4 +212,9 @@ public class PurchaseOrderController implements BusinessControllerMarker {
public CommonResult<List<PurchaseOrderRespVO>> boundOrder(@RequestBody DownOrUpOrderReqVO reqVO) {
return success(purchaseOrderService.getBindOrderByOrder(reqVO));
}
private String R(){
int number = (int) (Math.random() * 900000 + 100000);
return String.valueOf(number);
}
}

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderDetailPageReqVO.java
View File

@@ -39,7 +39,7 @@ public class SalesOrderDetailPageReqVO extends PageParam {
private String warehouseNumber;
@Schema(description = "计量单位;推送ERP(必须)")
private String unit;
private String unt;
@Schema(description = "开票类型;推送ERP(必须)", example = "2")
private String invoiceType;

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDetailDO.java
View File

@@ -77,7 +77,7 @@ public class SalesOrderDetailDO extends BusinessBaseDO {
* 计量单位;推送ERP(必须)
*/
@TableField("UNT")
private String unit;
private String unt;
/**
* 开票类型;推送ERP(必须)
*/

6
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/purchaseorder/PurchaseOrderMapper.java
View File

@@ -44,6 +44,7 @@ public interface PurchaseOrderMapper extends BaseMapperX<PurchaseOrderDO> {
.eqIfPresent(PurchaseOrderDO::getRemark, reqVO.getRemark())
.eqIfPresent(PurchaseOrderDO::getAgentNumber, reqVO.getAgentNumber())
.likeIfPresent(PurchaseOrderDO::getAgentName, reqVO.getAgentName())
.eqIfPresent(PurchaseOrderDO::getMtrlTp, reqVO.getMtrlTp())
// .eqIfPresent(PurchaseOrderDO::getOrderNumber, reqVO.getOrderNumber())
.eqIfPresent(PurchaseOrderDO::getContractNumber, reqVO.getContractNumber())
.eqIfPresent(PurchaseOrderDO::getMaterialNumber, reqVO.getMaterialNumber())
@@ -57,13 +58,16 @@ public interface PurchaseOrderMapper extends BaseMapperX<PurchaseOrderDO> {
.likeIfPresent(PurchaseOrderDO::getErpSalesCompanyName, reqVO.getErpSalesCompanyName())
.likeIfPresent(PurchaseOrderDO::getPurchaseOrganizationName, reqVO.getPurchaseOrganizationName())
.eqIfPresent(PurchaseOrderDO::getErpStatus, reqVO.getErpStatus())
.eqIfPresent(PurchaseOrderDO::getSplyBsnTp, reqVO.getSplyBsnTp()!=null?reqVO.getSplyBsnTp():"PUR")
.eqIfPresent(PurchaseOrderDO::getSplyBsnTp, reqVO.getSplyBsnTp() != null ? reqVO.getSplyBsnTp() : "PUR")
.eqIfPresent(PurchaseOrderDO::getCause, reqVO.getCause())
.eqIfPresent(PurchaseOrderDO::getStatus, reqVO.getStatus())
.likeIfPresent(PurchaseOrderDO::getPurchaseGroupName, reqVO.getPurchaseGroupName())
.orderByDesc(PurchaseOrderDO::getId));
}
List<PurchaseOrderWithDetailsVO> selectOrderByOrderNos(@Param("orderNos") List<String> orderNos);
List<PurchaseOrderWithDetailsVO> selectOrderByIds(@Param("ids") List<Long> id);
PurchaseOrderDO selectByOrderId(@Param("orderId") Long orderId);
}

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/salesorder/SalesOrderDetailMapper.java
View File

@@ -29,7 +29,7 @@ public interface SalesOrderDetailMapper extends BaseMapperX<SalesOrderDetailDO>
.eqIfPresent(SalesOrderDetailDO::getFactoryNumber, reqVO.getFactoryNumber())
.likeIfPresent(SalesOrderDetailDO::getWarehouseName, reqVO.getWarehouseName())
.eqIfPresent(SalesOrderDetailDO::getWarehouseNumber, reqVO.getWarehouseNumber())
.eqIfPresent(SalesOrderDetailDO::getUnit, reqVO.getUnit())
.eqIfPresent(SalesOrderDetailDO::getUnt, reqVO.getUnt())
.eqIfPresent(SalesOrderDetailDO::getInvoiceType, reqVO.getInvoiceType())
.eqIfPresent(SalesOrderDetailDO::getQuantity, reqVO.getQuantity())
.eqIfPresent(SalesOrderDetailDO::getTaxAcctasscat, reqVO.getTaxAcctasscat())

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/salesorder/SalesOrderMapper.java
View File

@@ -5,6 +5,7 @@ import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SalesOrderPageReqVO;
import com.zt.plat.module.contractorder.dal.dataobject.purchaseorder.PurchaseOrderDO;
import com.zt.plat.module.contractorder.dal.dataobject.salesorder.SalesOrderDO;
import com.zt.plat.module.contractorder.dal.dataobject.salesorder.SalesOrderDO;
import org.apache.ibatis.annotations.Mapper;
@@ -45,6 +46,7 @@ public interface SalesOrderMapper extends BaseMapperX<SalesOrderDO> {
.likeIfPresent(SalesOrderDO::getSaleAcsName, reqVO.getSaleAcsName())
.eqIfPresent(SalesOrderDO::getSaleAcsCdg, reqVO.getSaleAcsCdg())
.likeIfPresent(SalesOrderDO::getPdtGrpName, reqVO.getPdtGrpName())
.eqIfPresent(SalesOrderDO::getMtrlTp, reqVO.getMtrlTp())
.likeIfPresent(SalesOrderDO::getPdtGrpCdg, reqVO.getPdtGrpCdg())
.eqIfPresent(SalesOrderDO::getContractNumber, reqVO.getContractNumber())
.eqIfPresent(SalesOrderDO::getMaterialNumber, reqVO.getMaterialNumber())

Some files were not shown because too many files have changed in this diff Show More