|
@@ -19,6 +19,7 @@ import java.util.Map;
|
|
|
|
|
|
/**
|
|
|
* AmsPurchaseOrder服务实现:
|
|
|
+ *
|
|
|
* @author generator
|
|
|
* @version 1.0-SNAPSHORT 2021-10-23 02:50
|
|
|
* 类描述
|
|
@@ -27,8 +28,8 @@ import java.util.Map;
|
|
|
* 作者:generator
|
|
|
* 参考:
|
|
|
* 描述:AmsPurchaseOrder服务实现
|
|
|
- * @see null
|
|
|
* @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
|
|
|
+ * @see null
|
|
|
*/
|
|
|
@Service(value = "amsPurchaseOrderService")
|
|
|
public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
|
|
@@ -40,6 +41,7 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
|
|
|
|
|
|
/**
|
|
|
* 采购订单管理
|
|
|
+ *
|
|
|
* @param mapVal
|
|
|
* @return
|
|
|
*/
|
|
@@ -55,28 +57,28 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
|
|
|
String materialCode = (String) mapVal.get("materialCode");
|
|
|
// 得到外轮船名
|
|
|
String resultForeignShipName = (String) mapVal.get("resultForeignShipName");
|
|
|
- Map<String,Object> map = new HashMap<>();
|
|
|
- map.put("materialCode",materialCode);
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
+ map.put("materialCode", materialCode);
|
|
|
BigDecimal materialId = amsPurchaseOrderMapper.getMaterialId(materialCode);
|
|
|
- map.put("resultForeignShipName",resultForeignShipName);
|
|
|
+ map.put("resultForeignShipName", resultForeignShipName);
|
|
|
// 得到批次
|
|
|
BigDecimal batchId;
|
|
|
- if (amsPurchaseOrderMapper.getBatchId(map) == null) {
|
|
|
- DilBatch dilBatch = new DilBatch();
|
|
|
- batchId = dilBatchMapper.selectBatchId();
|
|
|
- dilBatch.setBatchId(batchId);
|
|
|
- dilBatch.setResultForeignShipName(resultForeignShipName);
|
|
|
- dilBatch.setMaterialId(materialId);
|
|
|
- dilBatch.setInsertTime(new Date());
|
|
|
- dilBatch.setUpdateTime(new Date());
|
|
|
- dilBatch.setInsertUsername("admin");
|
|
|
- dilBatch.setUpdateUsername("admin");
|
|
|
- dilBatch.setInsertUpdateRemark("无");
|
|
|
- dilBatchMapper.insertSelective(dilBatch);
|
|
|
- }
|
|
|
- else {
|
|
|
- batchId = amsPurchaseOrderMapper.getBatchId(map);
|
|
|
- }
|
|
|
+// if (amsPurchaseOrderMapper.getBatchId(map) == null) {
|
|
|
+ DilBatch dilBatch = new DilBatch();
|
|
|
+ batchId = dilBatchMapper.selectBatchId();
|
|
|
+ dilBatch.setBatchId(batchId);
|
|
|
+ dilBatch.setResultForeignShipName(resultForeignShipName);
|
|
|
+ dilBatch.setMaterialId(materialId);
|
|
|
+ dilBatch.setInsertTime(new Date());
|
|
|
+ dilBatch.setUpdateTime(new Date());
|
|
|
+ dilBatch.setInsertUsername("admin");
|
|
|
+ dilBatch.setUpdateUsername("admin");
|
|
|
+ dilBatch.setInsertUpdateRemark("无");
|
|
|
+ dilBatchMapper.insertSelective(dilBatch);
|
|
|
+// }
|
|
|
+// else {
|
|
|
+// batchId = amsPurchaseOrderMapper.getBatchId(map);
|
|
|
+// }
|
|
|
// 得到采购员
|
|
|
String purchaseOrderBuyer = (String) mapVal.get("purchaseOrderBuyer");
|
|
|
// // 得到发货单位
|
|
@@ -117,10 +119,10 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
|
|
|
amsPurchaseOrder.setUpdateTime(new Date());
|
|
|
amsPurchaseOrder.setUpdateUsername("admin");
|
|
|
amsPurchaseOrder.setInsertUpdateRemark("无");
|
|
|
- Map<String,Object> map1 = new HashMap<>();
|
|
|
+ Map<String, Object> map1 = new HashMap<>();
|
|
|
BigDecimal deleted = new BigDecimal(0);
|
|
|
- map1.put("purchaseOrderNo",purchaseOrderNo);
|
|
|
- map1.put("deleted",deleted);
|
|
|
+ map1.put("purchaseOrderNo", purchaseOrderNo);
|
|
|
+ map1.put("deleted", deleted);
|
|
|
List<AmsPurchaseOrder> amsPurchaseOrders = amsPurchaseOrderMapper.selectByParameters(map1);
|
|
|
// 新增
|
|
|
if (amsPurchaseOrders.size() == 0) {
|