|
@@ -6,10 +6,12 @@ import com.steerinfo.dil.service.IWmspRestackMakeResultService;
|
|
import com.steerinfo.dil.service.IWmspRestackScanResultService;
|
|
import com.steerinfo.dil.service.IWmspRestackScanResultService;
|
|
import com.steerinfo.dil.util.DataChange;
|
|
import com.steerinfo.dil.util.DataChange;
|
|
import com.steerinfo.dil.model.WmspGridMaterial;
|
|
import com.steerinfo.dil.model.WmspGridMaterial;
|
|
|
|
+import com.steerinfo.dil.util.IDUtils;
|
|
import com.steerinfo.framework.mapper.IBaseMapper;
|
|
import com.steerinfo.framework.mapper.IBaseMapper;
|
|
import com.steerinfo.framework.service.impl.BaseServiceImpl;
|
|
import com.steerinfo.framework.service.impl.BaseServiceImpl;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
+import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
@@ -42,6 +44,8 @@ public class WmspRestackMakeResultServiceImpl implements IWmspRestackMakeResult
|
|
private WmspGridMaterialMapper wmspGridMaterialMapper;
|
|
private WmspGridMaterialMapper wmspGridMaterialMapper;
|
|
@Autowired
|
|
@Autowired
|
|
private WmspRestackScanResultServiceImpl wmspRestackScanResultService;
|
|
private WmspRestackScanResultServiceImpl wmspRestackScanResultService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private WmspRestackMakeTypeResultServiceImpl wmspRestackMakeTypeResultService;
|
|
@Override
|
|
@Override
|
|
public List<Map<String, Object>> selectRestackMakeResultList(Map<String, Object> mapval) {
|
|
public List<Map<String, Object>> selectRestackMakeResultList(Map<String, Object> mapval) {
|
|
return wmspRestackMakeResultMapper.selectRestackMakeResultList(mapval);
|
|
return wmspRestackMakeResultMapper.selectRestackMakeResultList(mapval);
|
|
@@ -259,4 +263,61 @@ public class WmspRestackMakeResultServiceImpl implements IWmspRestackMakeResult
|
|
return wmspRestackMakeResultMapper.selectRestackForPc(map);
|
|
return wmspRestackMakeResultMapper.selectRestackForPc(map);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
|
|
+ *
|
|
|
|
+ * @param keeperId
|
|
|
|
+ * @param resultStackNumber
|
|
|
|
+ * @param afterStackingId
|
|
|
|
+ * @param afterWarehouseId
|
|
|
|
+ * @param afterBeforeStackingId
|
|
|
|
+ * @param resultRemark
|
|
|
|
+ * @param maps
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ @Transactional
|
|
|
|
+ @Override
|
|
|
|
+ public WmspRestackMakeResult createRestackMakeResult(
|
|
|
|
+ BigDecimal keeperId, String resultStackNumber, BigDecimal afterStackingId,
|
|
|
|
+ BigDecimal afterWarehouseId, BigDecimal afterBeforeStackingId, String resultRemark, List<Map<String, Object>> maps) {
|
|
|
|
+
|
|
|
|
+ WmspRestackMakeResult wmspRestackMakeResult=new WmspRestackMakeResult();
|
|
|
|
+
|
|
|
|
+ BigDecimal makeresultid =IDUtils.createIDYMDHMS( wmspRestackMakeResultMapper.selectMaxId());
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ wmspRestackMakeResult.setResultId(makeresultid);
|
|
|
|
+
|
|
|
|
+ wmspRestackMakeResult.setResultStackNumber(resultStackNumber);
|
|
|
|
+
|
|
|
|
+ wmspRestackMakeResult.setAfterStackingId(afterStackingId);
|
|
|
|
+
|
|
|
|
+ wmspRestackMakeResult.setResultMovelistTime(new Date());
|
|
|
|
+
|
|
|
|
+ wmspRestackMakeResult.setKeeperId(keeperId);
|
|
|
|
+
|
|
|
|
+ wmspRestackMakeResult.setInsertTime(new Date());
|
|
|
|
+ wmspRestackMakeResult.setInsertUsername(keeperId.toString());
|
|
|
|
+
|
|
|
|
+ wmspRestackMakeResult.setDeleted(new BigDecimal(0));
|
|
|
|
+
|
|
|
|
+ wmspRestackMakeResult.setDistributionstatus(new BigDecimal(0));
|
|
|
|
+
|
|
|
|
+ wmspRestackMakeResult.setAfterWarehouseId(afterWarehouseId);
|
|
|
|
+
|
|
|
|
+ wmspRestackMakeResult.setResultStatus(new BigDecimal((0)));
|
|
|
|
+
|
|
|
|
+ wmspRestackMakeResult.setResultRemark(resultRemark);
|
|
|
|
+
|
|
|
|
+ wmspRestackMakeResult.setAfterBeforeStackingId(afterBeforeStackingId);
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ Integer totalCount= wmspRestackMakeTypeResultService.createMakeTypeList(makeresultid,maps);
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ wmspRestackMakeResult.setQuantity(new BigDecimal(totalCount));
|
|
|
|
+
|
|
|
|
+ wmspRestackMakeResultMapper.insertSelective(wmspRestackMakeResult);
|
|
|
|
+ return wmspRestackMakeResult;
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|