diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/AdvanceEntity.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/AdvanceEntity.java index 2a4e15b83..0ec9744e2 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/AdvanceEntity.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/AdvanceEntity.java @@ -26,6 +26,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.sql.Date; +import java.time.LocalDate; /** @@ -236,7 +237,7 @@ public class AdvanceEntity { * 删除时间 */ @ApiModelProperty(value = "删除时间") - private Date createTime; + private LocalDate createTime; /** * 删除时间 */ diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceClient.java index bbff9c232..a1bffacbf 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceClient.java @@ -18,12 +18,10 @@ package com.logpm.oldproject.feign; import com.logpm.oldproject.dto.AdvanceDTO; import com.logpm.oldproject.entity.AdvanceEntity; -import org.springblade.common.constant.LauncherConstant; -import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RequestBody; import java.util.List; @@ -58,7 +56,7 @@ public interface IAdvanceClient { * @return */ @PostMapping(API_PREFIX + "/add") - Boolean addAdvanceClient(AdvanceEntity advanceEntity); + Integer addAdvanceClient(@RequestBody AdvanceEntity advanceEntity); /** @@ -66,8 +64,17 @@ public interface IAdvanceClient { * @param advanceDTO * @return */ - @PostMapping(API_PREFIX + "/queryData") + @GetMapping(API_PREFIX + "/queryData") List getQueryData(AdvanceDTO advanceDTO); + /** + * 查询预仓订单数据 + * @param orderSelfNum + * @return + */ + @GetMapping(API_PREFIX + "/queryDataOne") + AdvanceEntity getQueryDataOne(String orderSelfNum); + + } diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java index fabb83fef..9490f30ca 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java @@ -20,6 +20,7 @@ import com.logpm.oldproject.entity.AdvanceDetailEntity; import org.springblade.common.constant.LauncherConstant; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; /** * 预仓明细表 Feign接口类 @@ -28,7 +29,7 @@ import org.springframework.web.bind.annotation.PostMapping; * @since 2023-05-10 */ @FeignClient( - value = LauncherConstant.APPLICATION_OLDPROJECT_NAME + value = "logpm-old-project-cyz" ) public interface IAdvanceDetailClient { @@ -52,6 +53,6 @@ public interface IAdvanceDetailClient { * @return */ @PostMapping(API_PREFIX + "/addAdvanceDetail") - boolean addAdvanceDetail(AdvanceDetailEntity advanceDetailEntity); + boolean addAdvanceDetail(@RequestBody AdvanceDetailEntity advanceDetailEntity); } diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IDetailProductClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IDetailProductClient.java index fccd00102..a9a5b1dc6 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IDetailProductClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IDetailProductClient.java @@ -20,6 +20,7 @@ import com.logpm.oldproject.entity.DetailProductEntity; import org.springblade.common.constant.LauncherConstant; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; /** * 包内产品明细 Feign接口类 @@ -28,7 +29,7 @@ import org.springframework.web.bind.annotation.PostMapping; * @since 2023-05-10 */ @FeignClient( - value = LauncherConstant.APPLICATION_OLDPROJECT_NAME + value = "logpm-old-project-cyz" ) public interface IDetailProductClient { @@ -51,7 +52,7 @@ public interface IDetailProductClient { * @return */ @PostMapping(API_PREFIX + "/addDetailProduct") - Boolean addDetailProduct(DetailProductEntity detailProductEntity); + Boolean addDetailProduct(@RequestBody DetailProductEntity detailProductEntity); } diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IServiceNumClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IServiceNumClient.java index 94b8b37be..1264c2f01 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IServiceNumClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IServiceNumClient.java @@ -20,6 +20,7 @@ import com.logpm.oldproject.entity.ServiceNumEntity; import org.springblade.common.constant.LauncherConstant; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import java.util.List; @@ -30,7 +31,7 @@ import java.util.List; * @since 2023-05-10 */ @FeignClient( - value = LauncherConstant.APPLICATION_OLDPROJECT_NAME + value = "logpm-old-project-cyz" ) public interface IServiceNumClient { @@ -52,6 +53,6 @@ public interface IServiceNumClient { * @return */ @PostMapping(API_PREFIX + "/addServiceNum") - boolean addServiceNum(List serviceNumEntity); + Boolean addServiceNum(@RequestBody List serviceNumEntity); } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java index 522c84334..402fc98a3 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java @@ -217,7 +217,7 @@ public class FactoryXxlJob { advanceEntity.setSenderAddress(""); //发货地址 可以为空 advanceEntity.setSenderName(""); //发货工厂名称 可以为空 advanceEntity.setAdministratorsId(0);// 导入人 - advanceEntity.setCreateTime((java.sql.Date) new Date()); //添加时间 + advanceEntity.setCreateTime(LocalDate.now()); //添加时间 advanceEntity.setCarsNum(""); //派车单--snm 可以为空 advanceEntity.setDeleteTime(0); // 删除时间 advanceEntity.setWaybillNo("");//运单号 可以为空 @@ -227,16 +227,19 @@ public class FactoryXxlJob { advanceEntity.setFreeze(Byte.parseByte("1"));//冻结状态：1=正常，2=冻结 advanceEntity.setDeleteReason("");//删除原因 advanceEntity.setDeleteAdministratorsId(0);//删除用户 - Boolean aBoolean = iAdvanceClient.addAdvanceClient(advanceEntity); - if (aBoolean){ + Integer integer = iAdvanceClient.addAdvanceClient(advanceEntity); + if (integer > 0){ + //订单id - longIntegerMap.put(k,advanceEntity.getId()); + longIntegerMap.put(k,integer); +// longIntegerMap.put(k,advanceEntity.getId()); } }); //TODO 插入到老系统的的数据库 map.forEach((k,v) ->{ Integer aLong = longIntegerMap.get(k);//订单ID + StationOrderEntity stationOrderEntity = collect.get(k); // 订单 //添加订单明细 @@ -275,7 +278,8 @@ public class FactoryXxlJob { advanceDetailEntity.setDate2("");//预约到厂时间 advanceDetailEntity.setDate3("");//实际到厂时间 advanceDetailEntity.setDate4("");//开始装车时间 - advanceDetailEntity.setDate5("");//车辆离厂时间 + advanceDetailEntity.setDate5("");//完成装车时间 + advanceDetailEntity.setDate6("");//车辆离厂时间 advanceDetailEntity.setCreateTime(LocalDate.now());//创建时间 advanceDetailEntity.setDeleteTime(0);//删除时间 advanceDetailEntity.setServiceNum(stationOrderEntity.getTcWlb007());//服务号 @@ -284,8 +288,9 @@ public class FactoryXxlJob { // advanceDetailEntity.setDueDate(0);//交期 advanceDetailEntity.setRemark("");//备注 advanceDetailEntity.setOldId(0);// - advanceDetailClient.addAdvanceDetail(advanceDetailEntity); - // 添加包件信息 + boolean b = advanceDetailClient.addAdvanceDetail(advanceDetailEntity); + XxlJobLogger.log("addAdvanceDetail 添加状态 {}", b); + // 添加包件信息 DetailProductEntity detailProductEntity = new DetailProductEntity(); @@ -299,11 +304,12 @@ public class FactoryXxlJob { detailProductEntity.setCreateTime(LocalDate.now());//创建时间 detailProductEntity.setAdministratorsId(0);//创建人 detailProductEntity.setDeleteTime(0);//删除时间 - detailProductClient.addDetailProduct(detailProductEntity); + Boolean aBoolean11 = detailProductClient.addDetailProduct(detailProductEntity); + XxlJobLogger.log("addDetailProduct 添加状态 {}", aBoolean11); ServiceNumEntity serviceNum = new ServiceNumEntity(); serviceNum.setServiceNum(stationOrderEntity.getTcWlb007()); //服务号 - serviceNum.setTotal(stationOrderEntity.getTcWlb007()); //订单数量 + serviceNum.setTotal(stationOrderEntity.getTcWlb009().toString()); //订单数量 serviceNum.setDetailTotal(stationOrderEntity.getTcWlb009().toString()); // 包数量 serviceNum.setStoreName(""); //商场名 serviceNum.setStoreNo(""); // 商场编号 @@ -312,14 +318,24 @@ public class FactoryXxlJob { serviceNum.setCustomerRoad(""); //顾客地址 serviceNum.setIsOpai(1); //是否干仓配 serviceNum.setCompleteSet("V"); //齐套标识：Y=齐套，N=未齐套，V=未知 - serviceNum.setCreateTime(LocalDate.now()); +// serviceNum.setCreateTime(LocalDate.now()); serviceNum.setDeleteTime(0); list.add(serviceNum); + v.forEach(it ->{ + it.setIdentification("1"); + staorderPackagesService.updateById(it); + }); }); //添加服务号和订单自编号表 - serviceNumClient.addServiceNum(list); + Boolean aBoolean123 = serviceNumClient.addServiceNum(list); + XxlJobLogger.log("addServiceNum添加状态 {}", aBoolean123); + //修改提交状态 + stationOrderList.forEach(it ->{ + it.setIdentification("1"); + stationOrderService.updateById(it); + }); } return true; diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceClient.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceClient.java index 3ca47749b..b32c2a4b5 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceClient.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceClient.java @@ -16,15 +16,10 @@ */ package com.logpm.oldproject.feign; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.oldproject.dto.AdvanceDTO; import com.logpm.oldproject.entity.AdvanceEntity; import com.logpm.oldproject.service.IAdvanceService; import lombok.AllArgsConstructor; -import org.springblade.core.mp.support.BladePage; -import org.springblade.core.mp.support.Condition; -import org.springblade.core.mp.support.Query; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; @@ -57,9 +52,10 @@ public class AdvanceClient implements IAdvanceClient { @Override @PostMapping(API_PREFIX + "/add") - public Boolean addAdvanceClient(AdvanceEntity advanceEntity) { - System.out.println("老ill"); - return service.addAdvanceEntity(advanceEntity); + public Integer addAdvanceClient(AdvanceEntity advanceEntity) { +// System.out.println("老ill"); + service.addAdvanceEntity(advanceEntity); + return advanceEntity.getId(); } /** @@ -68,8 +64,15 @@ public class AdvanceClient implements IAdvanceClient { * @return */ @Override + @GetMapping(API_PREFIX + "/queryData") public List getQueryData(AdvanceDTO advanceDTO) { - return service.advanceEntityList(); + return service.advanceEntityList(advanceDTO); + } + + @Override + @GetMapping(API_PREFIX + "/queryDataOne") + public AdvanceEntity getQueryDataOne(String orderSelfNum) { + return service.advanceEntityOne(orderSelfNum); } } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceDetailClient.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceDetailClient.java index f3f92df56..023224a11 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceDetailClient.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceDetailClient.java @@ -20,6 +20,7 @@ import com.logpm.oldproject.entity.AdvanceDetailEntity; import com.logpm.oldproject.service.IAdvanceDetailService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; @@ -47,10 +48,10 @@ public class AdvanceDetailClient implements IAdvanceDetailClient { // } @Override - @GetMapping(API_PREFIX + "/addAdvanceDetail") + @PostMapping(API_PREFIX + "/addAdvanceDetail") public boolean addAdvanceDetail(AdvanceDetailEntity advanceDetailEntity) { //新增数据 - + System.out.println("AdvanceDetailClient执行了"); return advanceDetailService.addAdvanceDetail(advanceDetailEntity); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/DetailProductClient.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/DetailProductClient.java index ea7449f06..ec4410e3e 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/DetailProductClient.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/DetailProductClient.java @@ -20,6 +20,7 @@ import com.logpm.oldproject.entity.DetailProductEntity; import com.logpm.oldproject.service.IDetailProductService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; @@ -48,11 +49,11 @@ public class DetailProductClient implements IDetailProductClient { @Override - @GetMapping(API_PREFIX + "/addDetailProduct") + @PostMapping(API_PREFIX + "/addDetailProduct") public Boolean addDetailProduct(DetailProductEntity detailProductEntity) { + System.out.println("DetailProductClient执行了"); //添加包明细 - detailProductService.addDetailProduct(detailProductEntity); - return null; + return detailProductService.addDetailProduct(detailProductEntity); } } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/ServiceNumClient.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/ServiceNumClient.java index 775fe6c04..a83f80e69 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/ServiceNumClient.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/ServiceNumClient.java @@ -20,6 +20,7 @@ import com.logpm.oldproject.entity.ServiceNumEntity; import com.logpm.oldproject.service.IServiceNumService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; @@ -39,8 +40,8 @@ public class ServiceNumClient implements IServiceNumClient { private final IServiceNumService serviceNumService; @Override - @GetMapping(API_PREFIX + "/addServiceNum") - public boolean addServiceNum(List serviceNumEntity) { + @PostMapping(API_PREFIX + "/addServiceNum") + public Boolean addServiceNum(List serviceNumEntity) { return serviceNumService.addServiceNum(serviceNumEntity); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml index 4dd25060e..9af52bcfc 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml @@ -57,7 +57,7 @@ select * from ht_advance_detail where is_deleted = 0 - + INSERT INTO `ht_advance_detail`( `advance_id`, `is_pay`, `lineID`, `serialKey`, `area`, `orderSelfNum`, `type`, `systemType`, `orderNum`, `is_opai`, `mtdsNo`, `firstPackName`, `firstPackCode`, `siteName`, `siteCode`, `productCode`, `secondPackName`, `secondPackCode`, `thirdPackName`, `thirdPackCode`, `goodName`, `isAddin`, `isThirdAddin`, `isSuppin`, `mscsNum`, @@ -68,7 +68,7 @@ #{param.firstPackCode}, #{param.siteName}, #{param.siteCode}, #{param.productCode}, #{param.secondPackName}, #{param.secondPackCode}, #{param.thirdPackName}, #{param.thirdPackCode}, #{param.goodName}, #{param.isAddin}, #{param.isThirdAddin}, #{param.isSuppin}, #{param.mscsNum}, #{param.mtdsNum}, #{param.volume}, #{param.unitNo}, #{param.mctsTruck}, - #{param.mctsTruckNo},#{param.date100}, #{param.date2}, #{param.date3}, #{param.date4}, #{param.date5}, #{param.date6}, #{param.createTime}, #{param.updateTime}, + #{param.mctsTruckNo},#{param.date100}, #{param.date2}, #{param.date3}, #{param.date4}, #{param.date5}, #{param.date6}, NOW(), NOW(), #{param.deleteTime}, #{param.serviceNum}, #{param.admin}, #{param.administratorsId}, #{param.dueDate}, #{param.remark}, #{param.oldId}); diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.java index b15a78120..587c21ff3 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.java @@ -38,7 +38,7 @@ public interface AdvanceMapper { * 查询最近的数据 * @return */ - List advanceEntityList(); + List advanceEntityList(AdvanceEntity advanceEntity); /** * 添加订单记录 @@ -48,6 +48,5 @@ public interface AdvanceMapper { Boolean addAll(@Param("param") AdvanceEntity advanceEntity); - - + AdvanceEntity advanceEntityOne(@Param("orderSelfNum") String orderSelfNum); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml index fcfb6fa47..14441a83f 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml @@ -12,21 +12,30 @@ delete_administrators_id = 0 and create_time between DATE_SUB(NOW(), INTERVAL 7 DAY) AND NOW() + + + + - + INSERT INTO `ht_advance`( `orderSelfNum`, `siteName`, `area`, `orderTypeName`, `orderClassName`, `type`, `total`, `mtdsNo`, `firstPackName`, `firstPackCode`, `dealerCode`, `dealerName`, `dueDate`, `is_opai`, `orderNum`, `carrierName`, `customerName`, `customerPhone`, `customerRoad`, `systemType`, `storeNo`, `storeName`, `serialKey`, `serviceNum`, - `matingCode`, `contractNum`, `leaveBehind`, `senderName`, `senderMobile`, `senderAddress`, `administrators_id`, `create_time`, + `matingCode`, `contractNum`, `leaveBehind`, `senderName`, `senderMobile`, `senderAddress`, `administrators_id`, `create_time`,`update_time`, `delete_time`, `cars_num`, `waybill_status`, `waybill_no`, `mctsTruck`, `warehouse_id`, `old_id`, `freeze`, `delete_reason`, `delete_administrators_id`) VALUES ( #{param.orderSelfNum}, #{param.siteName}, #{param.area}, #{param.orderTypeName}, #{param.orderClassName},#{param.type}, #{param.total}, #{param.mtdsNo}, #{param.firstPackName}, #{param.firstPackCode}, #{param.dealerCode}, #{param.dealerName}, #{param.dueDate},#{param.isOpai}, #{param.orderNum}, #{param.carrierName}, #{param.customerName},#{param.customerPhone}, #{param.customerRoad}, #{param.systemType}, #{param.storeNo}, #{param.storeName}, #{param.serialKey}, #{param.serviceNum},#{param.matingCode}, #{param.contractNum}, #{param.leaveBehind}, #{param.senderName}, - #{param.senderMobile}, #{param.senderAddress}, #{param.administratorsId}, #{param.createTime}, #{param.deleteTime}, #{param.carsNum}, #{param.waybillStatus}, + #{param.senderMobile}, #{param.senderAddress}, #{param.administratorsId},NOW(),NOW(), #{param.deleteTime}, #{param.carsNum}, #{param.waybillStatus}, #{param.waybillNo}, #{param.mctsTruck}, #{param.warehouseId}, #{param.oldId},#{param.freeze}, #{param.deleteReason}, #{param.deleteAdministratorsId}); diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/DetailProductMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/DetailProductMapper.xml index 7aeaa00f1..869c2d523 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/DetailProductMapper.xml +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/DetailProductMapper.xml @@ -12,11 +12,11 @@ - + INSERT INTO `ht_detail_product`( `unit_no`, `productcode`, `productname`, `salenum`, `delivernum`, `producttype`, `buy_time`, - `create_time`, `administrators_id`, `delete_time`) + `create_time`, `update_time`,`administrators_id`, `delete_time`) VALUES ( #{param.unitNo}, #{param.productcode}, #{param.productname}, #{param.salenum}, #{param.delivernum}, #{param.producttype}, #{param.buyTime}, - #{param.createTime}, #{param.administratorsId}, #{param.deleteTime}); + NOW(), NOW(), #{param.administratorsId}, #{param.deleteTime}); diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/ServiceNumMapper.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/ServiceNumMapper.java index 7f8657b10..fe4740324 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/ServiceNumMapper.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/ServiceNumMapper.java @@ -49,6 +49,6 @@ public interface ServiceNumMapper extends BaseMapper { * @param serviceNum * @return */ - Boolean addAll(List serviceNum); + Boolean addAll(@Param("list") List serviceNum); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/ServiceNumMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/ServiceNumMapper.xml index 1665b3497..357911605 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/ServiceNumMapper.xml +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/ServiceNumMapper.xml @@ -26,13 +26,13 @@ - + INSERT INTO `ht_service_num`( `serviceNum`, `total`, `detail_total`, `storeName`, `storeNo`, `customerName`, `customerPhone`, - `customerRoad`, `is_opai`, `complete_set`, `create_time`, `delete_time`) + `customerRoad`, `is_opai`, `complete_set`, `create_time`,`update_time`, `delete_time`) VALUES ( #{item.serviceNum}, #{item.total}, #{item.detailTotal}, #{item.storeName}, #{item.storeNo}, #{item.customerName}, #{item.customerPhone}, - #{item.customerRoad}, #{item.isOpai}, #{item.completeSet},#{item.createTime}, #{item.deleteTime}); + #{item.customerRoad}, #{item.isOpai}, #{item.completeSet},NOW(), NOW(), #{item.deleteTime}) diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IAdvanceService.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IAdvanceService.java index a0a882079..a5ee1c2bc 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IAdvanceService.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IAdvanceService.java @@ -16,6 +16,7 @@ */ package com.logpm.oldproject.service; +import com.logpm.oldproject.dto.AdvanceDTO; import com.logpm.oldproject.entity.AdvanceEntity; import java.util.List; @@ -30,9 +31,11 @@ public interface IAdvanceService { /** * 查询最近的数据 * @return + * @param advanceDTO */ - List advanceEntityList(); + List advanceEntityList(AdvanceDTO advanceDTO); Boolean addAdvanceEntity(AdvanceEntity advanceEntity); + AdvanceEntity advanceEntityOne(String orderSelfNum); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceServiceImpl.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceServiceImpl.java index 6e4e91712..71a09fc0d 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceServiceImpl.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceServiceImpl.java @@ -16,10 +16,14 @@ */ package com.logpm.oldproject.service.impl; +import com.logpm.oldproject.dto.AdvanceDTO; import com.logpm.oldproject.entity.AdvanceEntity; import com.logpm.oldproject.mapper.AdvanceMapper; import com.logpm.oldproject.service.IAdvanceService; +import io.micrometer.core.instrument.binder.BaseUnits; import lombok.AllArgsConstructor; +import org.springblade.core.tool.utils.BeanUtil; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.List; @@ -39,14 +43,22 @@ public class AdvanceServiceImpl implements IAdvanceService { /** * 查询最近的数据 * @return + * @param advanceDTO */ @Override - public List advanceEntityList() { - return advanceMapper.advanceEntityList(); + public List advanceEntityList(AdvanceDTO advanceDTO) { + AdvanceEntity advanceEntity = new AdvanceEntity(); + BeanUtils.copyProperties(advanceDTO,advanceEntity); + return advanceMapper.advanceEntityList(advanceEntity); } @Override public Boolean addAdvanceEntity(AdvanceEntity advanceEntity) { return advanceMapper.addAll(advanceEntity); } + + @Override + public AdvanceEntity advanceEntityOne(String orderSelfNum) { + return advanceMapper.advanceEntityOne(orderSelfNum); + } }