|
@@ -193,7 +193,7 @@ public class WmspOutboundResultServiceImpl implements IWmspOutboundResultServic
|
|
|
int result = 0;
|
|
|
|
|
|
List<Map<String,Object>> materialNumberList = wmspOutboundResultMapper.getScanMaterialNumber(new BigDecimal(resultId));
|
|
|
-
|
|
|
+
|
|
|
List<Map<String,Object>> orderMaterialNumberList = wmspOutboundResultMapper.getOunboundOrderNumber(new BigDecimal(resultId));
|
|
|
BigDecimal orderMaterialNumber = (BigDecimal) orderMaterialNumberList.get(0).get("orderMaterialNumber");
|
|
|
int outboundMaterialNumber = materialNumberList.size();
|
|
@@ -217,14 +217,14 @@ public class WmspOutboundResultServiceImpl implements IWmspOutboundResultServic
|
|
|
}
|
|
|
|
|
|
|
|
|
- * 判断物质是否已经都已经被扫描
|
|
|
+ * 判断物资是否已经都已经被扫描
|
|
|
* @param resultId
|
|
|
* @return
|
|
|
*/
|
|
|
@Override
|
|
|
public int EqualMaterialsNumber(BigDecimal resultId) {
|
|
|
int EqualMaterialsNumber = 0;
|
|
|
-
|
|
|
+
|
|
|
List<Map<String,Object>> materialNumberList = wmspOutboundResultMapper.getScanMaterialNumber(resultId);
|
|
|
|
|
|
List<Map<String,Object>> orderMaterialNumberList = wmspOutboundResultMapper.getOunboundOrderNumber(resultId);
|
|
@@ -394,9 +394,9 @@ public class WmspOutboundResultServiceImpl implements IWmspOutboundResultServic
|
|
|
if(date==null){
|
|
|
|
|
|
i += wmspGridMaterialMapper.updateByMaterialId(materialSteelId,new Date());
|
|
|
-
|
|
|
+
|
|
|
int isReserve= wmsInboundResultService.getTypeMaterilaId(materialSteelId);
|
|
|
-
|
|
|
+
|
|
|
if (isReserve>0){
|
|
|
|
|
|
int status2= wmsInboundResultService.updateStatusByMaterialId(materialSteelId);
|
|
@@ -418,7 +418,7 @@ public class WmspOutboundResultServiceImpl implements IWmspOutboundResultServic
|
|
|
|
|
|
@Override
|
|
|
public int sureOutbount(BigDecimal resultId) {
|
|
|
-
|
|
|
+
|
|
|
List<OutBoundTypeDetailedInfo> outBoundTypeDetailedInfos= wmspOutboundResultMaterialService.getOutBoundTypeDetailedInfo(resultId,1);
|
|
|
|
|
|
|
|
@@ -430,9 +430,10 @@ public class WmspOutboundResultServiceImpl implements IWmspOutboundResultServic
|
|
|
if (onlycodes.size()>0){
|
|
|
|
|
|
List<OutBoundMaterialDetailedInfo> outBoundMaterialDetailedInfos= wmspOutboundScanResultService.getOutBoundMaterialDetailedInfos(onlycodes,1);
|
|
|
+
|
|
|
|
|
|
for (OutBoundTypeDetailedInfo typeDetailedInfo :outBoundTypeDetailedInfos){
|
|
|
-
|
|
|
+
|
|
|
List<OutBoundMaterialDetailedInfo> thisMaterialDetailedInfos=new ArrayList<>();
|
|
|
int count=0;
|
|
|
for (OutBoundMaterialDetailedInfo outBoundMaterialDetailedInfo: outBoundMaterialDetailedInfos){
|
|
@@ -443,13 +444,13 @@ public class WmspOutboundResultServiceImpl implements IWmspOutboundResultServic
|
|
|
}
|
|
|
|
|
|
typeDetailedInfo.setScanCodeNumber(count);
|
|
|
-
|
|
|
+
|
|
|
if (typeDetailedInfo.getNumber()==typeDetailedInfo.getScanCodeNumber()){
|
|
|
-
|
|
|
+
|
|
|
int cunt= wmspGridMaterialService.deleteGridMaterial(thisMaterialDetailedInfos);
|
|
|
cunt2=wmspOutboundResultMaterialService.updateStatus(typeDetailedInfo.getResultMaterialId());
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (outBoundTypeDetailedInfos==null||outBoundTypeDetailedInfos.size()-cunt2==0){
|
|
|
int cunt3=wmspOutboundResultMapper.updateStatus(resultId);
|
|
|
|