|
@@ -117,8 +117,8 @@ public class WmshGridMaterialServiceImpl implements IWmshGridMaterialService {
|
|
public int clearWmshGridMaterial(Map<String, Object> map) {
|
|
public int clearWmshGridMaterial(Map<String, Object> map) {
|
|
int i=0;
|
|
int i=0;
|
|
BigDecimal gmId =DataChange.dataToBigDecimal(map.get("gmId"));
|
|
BigDecimal gmId =DataChange.dataToBigDecimal(map.get("gmId"));
|
|
- WmshGridMaterial wmshGridMaterial=new WmshGridMaterial();
|
|
|
|
- wmshGridMaterial.setGmId(gmId);
|
|
|
|
|
|
+ WmshGridMaterial wmshGridMaterial=wmshGridMaterialMapper.selectByPrimaryKey(gmId);
|
|
|
|
+ BigDecimal surplus=wmshGridMaterial.getGmTonnage();
|
|
wmshGridMaterial.setGmTonnage(new BigDecimal(0));
|
|
wmshGridMaterial.setGmTonnage(new BigDecimal(0));
|
|
i = wmshGridMaterialMapper.updateByPrimaryKeySelective(wmshGridMaterial);
|
|
i = wmshGridMaterialMapper.updateByPrimaryKeySelective(wmshGridMaterial);
|
|
//实时库存
|
|
//实时库存
|
|
@@ -130,7 +130,7 @@ public class WmshGridMaterialServiceImpl implements IWmshGridMaterialService {
|
|
wmshOutboundResult.setResultNumber(gckd);
|
|
wmshOutboundResult.setResultNumber(gckd);
|
|
wmshOutboundResult.setResultClearing(isClear);
|
|
wmshOutboundResult.setResultClearing(isClear);
|
|
wmshOutboundResult.setInsertTime(new Date());
|
|
wmshOutboundResult.setInsertTime(new Date());
|
|
- wmshOutboundResult.setResultTonnage(DataChange.dataToBigDecimal(map.get("resultMaterialNumber")));
|
|
|
|
|
|
+ wmshOutboundResult.setResultTonnage(surplus);
|
|
wmshOutboundResult.setBatchId(DataChange.dataToBigDecimal(map.get("batchId")));
|
|
wmshOutboundResult.setBatchId(DataChange.dataToBigDecimal(map.get("batchId")));
|
|
BigDecimal portId = DataChange.dataToBigDecimal(map.get("portId"));
|
|
BigDecimal portId = DataChange.dataToBigDecimal(map.get("portId"));
|
|
wmshOutboundResult.setHarborId(portId);
|
|
wmshOutboundResult.setHarborId(portId);
|