root/wms_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:单据同步

Browse Source
This commit is contained in:
zhangzq
2024-05-14 16:41:56 +08:00
parent e5e8d912d9
commit f63d3156c6
5 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java
View File

@@ -11,6 +11,7 @@ import java.util.List;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.nl.common.enums.StatusEnum;
/**
* <p>
@@ -62,7 +63,7 @@ public class PmFormData implements Serializable {
/**
* 业务单据状态
*/
private String status;
private String status = StatusEnum.FORM_STATUS.code("生成");
/**
* 创建id
@@ -83,6 +84,10 @@ public class PmFormData implements Serializable {
* 数量
*/
private BigDecimal qty;
/**
* 分配数量
*/
private BigDecimal assign_qty;
/**
* 数量

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java
View File

@@ -112,7 +112,7 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
//基础字段
Set<String> fields = ListOf.ofSet(formStruc.getBiz_code(), formStruc.getBiz_id(), formStruc.getBiz_code(), formStruc.getBiz_status(), formStruc.getMaterial_id(), formStruc.getPcsn(), formStruc.getVehicle_code(), formStruc.getUnit_id(), formStruc.getQty());
JSONObject data = fieldMapping(fields, fieldMapping, sourceData);
data.put("form_type",formStruc.getForm_type());
JSONObject form_param = formStruc.getForm_param();
if (form_param!=null){
JSONObject form_data = fieldMapping(form_param.keySet(), fieldMapping, sourceData);

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/form_mapping/SyncFormMappingController.java
View File

@@ -89,10 +89,14 @@ public class SyncFormMappingController {
public ResponseEntity<Object> syncAnalyse(@RequestBody JSONObject form){
//参数判读，参数解析，调用参数入库
Object analyseData = form.remove("analyseData");
Object needSave = form.remove("needSave");
if (analyseData == null){
throw new BadRequestException("解析数据不能为空");
}
List<PmFormData> pmFormDatas = formDataService.syncAnalyse(form.toJavaObject(SyncFormMapping.class), (String) analyseData);
if (needSave!=null && (Boolean)needSave){
formDataService.saveBatch(pmFormDatas);
}
return new ResponseEntity<>(TableDataInfo.build(pmFormDatas),HttpStatus.CREATED);
}