rsf-server/src/main/java/asnOrder.sql
File was deleted rsf-server/src/main/java/asnOrderItem.sql
File was deleted rsf-server/src/main/java/batchRegular.sql
File was deleted rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -255,8 +255,10 @@ .setStockUnit(matnr.getStockUnit()); QlyInspect inspect = qlyInspectMapper.selectOne(new LambdaQueryWrapper<QlyInspect>() .eq(QlyInspect::getAsnItemId, asnOrderItem.getId()).eq(QlyInspect::getPoItemId, asnOrderItem.getPoDetlId())); //set 质检结果 detlsDto.setInspect(inspect.getStatus$()); if (!Objects.isNull(inspect)) { //set 质检结果 detlsDto.setInspect(inspect.getStatus$()); } //获取当前库存信息 StockItem stockItem = stockItemMapper.selectOne(new LambdaQueryWrapper<StockItem>() .eq(StockItem::getAsnItemId, asnOrderItem.getId()) rsf-server/src/main/java/com/vincent/rsf/server/common/config/MybatisPlusConfig.java
@@ -73,7 +73,9 @@ } catch (Exception e) { System.out.println(e.getMessage()); } return new NullValue(); //TODO 需设置一个系统调度帐号 // return new NullValue(); return new LongValue(1); } } rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java
@@ -3,18 +3,16 @@ import java.text.SimpleDateFormat; import java.util.Date; import com.baomidou.mybatisplus.annotation.*; import com.vincent.rsf.server.manager.service.*; import org.springframework.format.annotation.DateTimeFormat; import com.baomidou.mybatisplus.annotation.TableLogic; import java.text.SimpleDateFormat; import java.util.Date; import java.text.SimpleDateFormat; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -142,24 +140,28 @@ * ASN单据,带出PO单 */ @ApiModelProperty(value= "ASN单据,带出PO单") @TableField(exist = false) private String asnOrder; /** * ERP凭证 */ @ApiModelProperty(value= "ERP凭证") @TableField(exist = false) private String erpToken; /** * ERP单号 */ @ApiModelProperty(value= "ERP单号") @TableField(exist = false) private String erpOrder; /** * ERP库存地址 */ @ApiModelProperty(value= "ERP库存地址") @TableField(exist = false) private String erpStkAdr; /** @@ -184,18 +186,21 @@ * 锁定原因 */ @ApiModelProperty(value= "锁定原因") @TableField(exist = false) private String lockReason; /** * 锁定状态 */ @ApiModelProperty(value= "锁定状态") @TableField(exist = false) private Short lockStatus; /** * 锁定人 */ @ApiModelProperty(value= "锁定人") @TableField(exist = false) private String locker; /** @@ -203,6 +208,7 @@ */ @ApiModelProperty(value= "锁定时间") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @TableField(exist = false) private Date lockedTime; /** rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
@@ -52,7 +52,8 @@ * @return * @time 2025/3/3 15:44 */ @Scheduled(cron = "0 0/30 * * * ? ") @Scheduled(cron = "0 0/05 * * * ? ") // @Scheduled(cron = "0/5 * * * * ?") @Transactional(rollbackFor = Exception.class) public void genAsnOrder() { //判断是否开启自动生成ASN单据 @@ -92,7 +93,12 @@ List<AsnOrderItem> orderItems = new ArrayList<>(); items.forEach(item -> { AsnOrderItem orderItem = new AsnOrderItem(); Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getId, item.getMatnrCode())); Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, item.getMatnrCode())); if (Objects.isNull(matnr)) { throw new CoolException("数据错误：当前物料不存在!!"); } //TODO barcode生成策略 String barcode = code + matnr.getCode(); orderItem.setAnfme(item.getAnfme()) .setAsnId(order.getId()) .setQty(item.getQty()) @@ -100,6 +106,7 @@ .setSplrCode(item.getSplrCode()) .setMatnk(item.getMatnrName()) .setPoDetlId(item.getId()) .setBarcode(barcode) .setPoCode(purchase.getCode()) .setPurQty(item.getAnfme()) .setPurUnit(item.getUnit()) @@ -114,7 +121,7 @@ //任务执行完成，修改已完成数量和PO单执行状态 purchase.setQty(purchase.getAnfme()).setStatus(1); if (!purchaseService.save(purchase)) { if (!purchaseService.saveOrUpdate(purchase)) { throw new CoolException("PO单执行完成后，保存失败！！"); }
File was deleted rsf-server/src/main/java/container.sql
File was deleted rsf-server/src/main/java/contract.sql
File was deleted rsf-server/src/main/java/customer.sql
File was deleted rsf-server/src/main/java/dictData.sql
File was deleted rsf-server/src/main/java/dictType.sql
File was deleted rsf-server/src/main/java/loc.sql
File was deleted rsf-server/src/main/java/matnr.sql
File was deleted rsf-server/src/main/java/matnrGroup.sql
File was deleted rsf-server/src/main/java/purchase.sql
File was deleted rsf-server/src/main/java/purchaseItem.sql
File was deleted rsf-server/src/main/java/qlyInspect.sql
File was deleted rsf-server/src/main/java/serialRule.sql
File was deleted rsf-server/src/main/java/serialRuleItem.sql
File was deleted rsf-server/src/main/java/shipper.sql
File was deleted rsf-server/src/main/java/warehouse.sql
File was deleted rsf-server/src/main/java/warehouseAreas.sql
File was deleted rsf-server/src/main/java/warehouseAreasItem.sql
File was deleted rsf-server/src/main/resources/application.yml
@@ -23,7 +23,7 @@ # global-config: # field-strategy: 0 configuration: # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl log-impl: org.apache.ibatis.logging.stdout.StdOutImpl map-underscore-to-camel-case: true cache-enabled: true global-config:
